From 7b7b515c0dec69443afceb9ace509657b4bd28e4 Mon Sep 17 00:00:00 2001
From: Thoralf Klein <thoralf@fischlustig.de>
Date: Sun, 11 May 2014 01:40:26 +0200
Subject: [PATCH] SGRefObjects not allowed to share RefCount object any more.
 Fixed unit test; moved threaded stress_test fo RefCount_unittest.

---
 src/shogun/base/SGRefObject.cpp      |  5 +--
 tests/unit/base/RefCount_unittest.cc | 54 ++++++++++++++++++++++++++++
 tests/unit/base/SGObject_unittest.cc | 31 +++++++++-------
 3 files changed, 76 insertions(+), 14 deletions(-)
 create mode 100644 tests/unit/base/RefCount_unittest.cc

diff --git a/src/shogun/base/SGRefObject.cpp b/src/shogun/base/SGRefObject.cpp
index f26b9dbf88b..a9d94b3b06d 100644
--- a/src/shogun/base/SGRefObject.cpp
+++ b/src/shogun/base/SGRefObject.cpp
@@ -30,8 +30,9 @@ SGRefObject::SGRefObject()
 SGRefObject::SGRefObject(const SGRefObject& orig)
 {
 	init();
-	m_refcount = orig.m_refcount;
-	SG_REF(this);
+	m_refcount = new RefCount(0);
+
+	SG_SGCDEBUG("SGRefObject copied (%p)\n", this)
 }
 
 SGRefObject::~SGRefObject()
diff --git a/tests/unit/base/RefCount_unittest.cc b/tests/unit/base/RefCount_unittest.cc
new file mode 100644
index 00000000000..cdbb45445b0
--- /dev/null
+++ b/tests/unit/base/RefCount_unittest.cc
@@ -0,0 +1,54 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Written (W) 2014 Thoralf Klein
+ */
+
+#include <shogun/lib/RefCount.h>
+#include <pthread.h>
+#include <gtest/gtest.h>
+
+using namespace shogun;
+
+void * stress_test_helper(void * args)
+{
+	RefCount * rc = (RefCount *) args;
+
+	for (index_t i = 0; i < 1000000; i++)
+	{
+		rc->ref();
+		rc->ref();
+		rc->unref();
+		rc->unref();
+	}
+
+	pthread_exit(0);
+}
+
+TEST(RefCount, stress_test)
+{
+	RefCount * rc = new RefCount(0);
+	EXPECT_EQ(rc->ref_count(), 0);
+	rc->ref();
+	EXPECT_EQ(rc->ref_count(), 1);
+
+	pthread_t * threads = new pthread_t[10];
+
+	for (index_t i = 0; i < 10; i++)
+	{
+		pthread_create(&threads[i], NULL, stress_test_helper, static_cast<void *>(rc));
+	}
+
+	for (index_t i = 0; i < 10; i++)
+	{
+		pthread_join(threads[i], NULL);
+	}
+
+	EXPECT_EQ(rc->ref_count(), 1);
+	rc->unref();
+	EXPECT_EQ(rc->ref_count(), 0);
+	delete [] threads;
+}
diff --git a/tests/unit/base/SGObject_unittest.cc b/tests/unit/base/SGObject_unittest.cc
index bf34f3d748f..34b5b826c81 100644
--- a/tests/unit/base/SGObject_unittest.cc
+++ b/tests/unit/base/SGObject_unittest.cc
@@ -5,6 +5,7 @@
  * (at your option) any later version.
  *
  * Written (W) 2013 Heiko Strathmann
+ * Written (W) 2014 Thoralf Klein
  */
 
 #include <shogun/labels/BinaryLabels.h>
@@ -66,26 +67,32 @@ void* stress_test(void* args)
 }
 
 #ifdef USE_REFERENCE_COUNTING
-TEST(SGObject,ref_unref)
+TEST(SGObject,DISABLED_ref_copy_constructor)
 {
 	CBinaryLabels* labs = new CBinaryLabels(10);
 	EXPECT_EQ(labs->ref_count(), 0);
+
+	SG_REF(labs);
+	EXPECT_EQ(labs->ref_count(), 1);
+
+	// TODO: This causes memory corruptions; disabled test until fixed
+	CBinaryLabels* labs_2 = new CBinaryLabels(*labs);
+	SG_UNREF(labs_2);
+
+	SG_UNREF(labs);
+	EXPECT_TRUE(labs == NULL);
+}
+
+TEST(SGObject,ref_unref_simple)
+{
+	CBinaryLabels* labs = new CBinaryLabels(10);
+	EXPECT_EQ(labs->ref_count(), 0);
+
 	SG_REF(labs);
 	EXPECT_EQ(labs->ref_count(), 1);
 
-	pthread_t* threads = new pthread_t[10];
-	for (index_t i=0; i<10; i++)
-	{
-		pthread_create(&threads[i], NULL, stress_test, static_cast<void* >(labs));
-	}
-	for (index_t i=0; i<10; i++)
-	{
-		pthread_join(threads[i], NULL);
-		//SG_UNREF(labs);
-	}
 	SG_UNREF(labs);
 	EXPECT_TRUE(labs == NULL);
-	delete [] threads;
 }
 #endif