Changeset c6a59b for src/Patterns

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.

Location:

src/Patterns

Files:

• Makefile.am (modified) (1 diff)
• unittests/SingletonUnitTest.cpp (modified) (2 diffs)
• unittests/SingletonUnitTest.hpp (modified) (2 diffs)

src/Patterns/Makefile.am

@@ -23 +23 @@
         $(top_srcdir)/src/CodePatterns/ManipulablePrototypeFactory_impl.hpp \
         $(top_srcdir)/src/CodePatterns/ObservedValue.hpp \
-        $(top_srcdir)/src/CodePatterns/Registry_impl.hpp \
-        $(top_srcdir)/src/CodePatterns/Singleton_impl.hpp \
         $(top_srcdir)/src/CodePatterns/PrototypeFactory.hpp \
         $(top_srcdir)/src/CodePatterns/PrototypeFactory_impl.hpp \
         $(top_srcdir)/src/CodePatterns/Registry.hpp \
-        $(top_srcdir)/src/CodePatterns/Singleton.hpp
+        $(top_srcdir)/src/CodePatterns/Registry_impl.hpp \
+        $(top_srcdir)/src/CodePatterns/Singleton.hpp \
+        $(top_srcdir)/src/CodePatterns/Singleton_impl.hpp
 
 PATTERNDEBUGHEADER =

src/Patterns/unittests/SingletonUnitTest.cpp

@@ -81 +81 @@
 CONSTRUCT_SINGLETON(SingletonStub2);
 
-void SingletonTest::setUp(){}
+void SingletonTest::setUp()
+{
+  ASSERT_DO(Assert::Throw);
+}
+
 void SingletonTest::tearDown(){}
 
@@ -152 +156 @@
   // mechanism. Check with Valgrind to see if memory-leak occurs
   std::cout << "Not purging Singleton!\n Check with Valgrind to see if automatic purgins is working!" << std::endl;
+}
 
+void SingletonTest::LockedTest(){
+  const AtomicInstance<SingletonStub1> ptr_1_1(SingletonStub1::getLockedInstance());
+  const SingletonStub1 &test_1 = *ptr_1_1;
+
+  // this deadlocks
+//  AtomicInstance<SingletonStub1> ptr_1_2(SingletonStub1::getLockedInstance());
+
+  AtomicInstance<SingletonStub2> ptr_2_1(SingletonStub2::getLockedInstance());
+  SingletonStub2 &test_2 = *ptr_2_1;
+
+  // this deadlocks
+//  AtomicInstance<SingletonStub2> ptr_2_2(SingletonStub2::getLockedInstance());
 }

src/Patterns/unittests/SingletonUnitTest.hpp

@@ -20 +20 @@
   CPPUNIT_TEST_SUITE( SingletonTest );
   CPPUNIT_TEST ( ConstructionTest );
+  CPPUNIT_TEST ( LockedTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -27 +28 @@
 
   void ConstructionTest();
+  void LockedTest();
 };