ensure singleton::get thread safe construct instance (#658)

* ensure singleton::get thread safe construct instance * fix singleton return reference Co-authored-by: xuweiqi <[email protected]>
SNU-ARC · Feb 7, 2024 · 56ea302 · 56ea302
1 parent 2633cf8
commit 56ea302
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/tools/library/src/singleton.cu b/tools/library/src/singleton.cu
@@ -42,10 +42,6 @@ namespace library {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
-static std::unique_ptr<Singleton> instance;
-
-/////////////////////////////////////////////////////////////////////////////////////////////////
-
 Singleton::Singleton() {
 
   manifest.initialize();
@@ -54,10 +50,8 @@ Singleton::Singleton() {
 }
 
 Singleton const & Singleton::get() {
-  if (!instance.get()) {
-    instance.reset(new Singleton);
-  }
-  return *instance.get();
+  static Singleton instance;
+  return instance;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////