refactor: singleton template class

mfavant · Sep 29, 2023 · 9e6cd93 · 9e6cd93
1 parent 0904972
commit 9e6cd93
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/bin/config/main.ini b/bin/config/main.ini
@@ -4,8 +4,8 @@ port = 20023
 threads = 3
 max_conn = 20000
 wait_time = 10
-#task_type = HTTP_TASK
-task_type = STREAM_TASK
+task_type = HTTP_TASK
+#task_type = STREAM_TASK
 # now support HTTP_TASK or STREAM_TASK
 daemon = 1
 

diff --git a/src/utility/singleton.h b/src/utility/singleton.h
@@ -14,19 +14,31 @@ namespace tubekit
         class singleton
         {
         public:
-            static T *instance()
+            template <typename... Args>
+            static T *instance(Args &&...args)
             {
-                static std::shared_ptr<T> instance = nullptr;
-                if (instance == nullptr)
+                if (m_instance == nullptr)
                 {
-                    instance = std::make_shared<T>();
+                    m_instance = std::make_shared<T>(std::forward<Args>(args)...);
                 }
-                return instance.get();
+                return m_instance.get();
+            }
+            static T *get_instance()
+            {
+                return m_instance.get();
+            }
+            static void destory_instance()
+            {
+                m_instance.reset();
             }
 
         protected:
             singleton() = default;
             ~singleton() = default;
+            static std::shared_ptr<T> m_instance;
         };
+
+        template <typename T>
+        std::shared_ptr<T> singleton<T>::m_instance = nullptr;
     }
 }