Changeset c6a59b for src/CodePatterns/Singleton_impl.hpp

Timestamp:

May 5, 2016, 1:06:20 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

c1e104

Parents:

039e15

git-author:

Frederik Heber <heber@…> (05/05/16 09:20:08)

git-committer:

Frederik Heber <heber@…> (05/05/16 13:06:20)

Message:

Singleton extended to also return AtomicInstance-wrapped instance.

File:

• src/CodePatterns/Singleton_impl.hpp (modified) (2 diffs)

src/CodePatterns/Singleton_impl.hpp

@@ -45 +45 @@
   }
   return *theInstance;
+}
+
+template <class T,bool _may_create>
+AtomicInstance<T> Singleton<T,_may_create>::getLockedInstance(){
+  // boost supports RAII-Style locking, so we don't need to unlock
+  boost::recursive_mutex::scoped_lock guard(instanceLock);
+  if(!theInstance.get()) {
+    theInstance.reset(creator::make());
+  }
+  T *ptr = theInstance.get();
+  return AtomicInstance<T>(ptr);
 }
 
@@ -120 +131 @@
     template name& Singleton< name , name::may_create >::getInstance(); \
     template const name& Singleton< name , name::may_create >::getConstInstance(); \
+    template AtomicInstance<name> Singleton< name , name::may_create >::getLockedInstance(); \
     template name* Singleton< name , name::may_create >::getPointer();  \
     template const name* Singleton< name , name::may_create >::getConstPointer();  \