Merge pull request #504 from gsomix/CSet

СMap for mallocs tracing
shogun-toolbox · May 7, 2012 · f04183b · f04183b
2 parents 8105d5f + 0e70022
commit f04183b
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 143 deletions.
diff --git a/examples/undocumented/libshogun/Makefile b/examples/undocumented/libshogun/Makefile
@@ -59,7 +59,6 @@ TARGETS = basic_minimal \
 		  splitting_standard_crossvalidation \
 		  mathematics_arpack \
 		  library_fibonacci_heap \
-		  library_hashset \
 		  mathematics_lapack \
 		  converter_locallylinearembedding \
 		  converter_localtangentspacealignment \

diff --git a/examples/undocumented/libshogun/library_hashset.cpp b/examples/undocumented/libshogun/library_hashset.cpp
diff --git a/src/shogun/base/SGObject.cpp b/src/shogun/base/SGObject.cpp
@@ -1021,8 +1021,8 @@ void CSGObject::save_serializable_post() throw (ShogunException)
 }
 
 #ifdef TRACE_MEMORY_ALLOCS
-#include <shogun/lib/Set.h>
-extern CSet<shogun::MemoryBlock>* sg_mallocs;
+#include <shogun/lib/Map.h>
+extern CMap<void*, shogun::MemoryBlock>* sg_mallocs;
 #endif
 
 void CSGObject::init()
@@ -1034,7 +1034,7 @@ void CSGObject::init()
 #ifdef TRACE_MEMORY_ALLOCS
 	if (sg_mallocs)
 	{
-		int32_t idx=sg_mallocs->index_of(MemoryBlock(this));
+		int32_t idx=sg_mallocs->index_of(this);
 		if (idx>-1)
 		{
 			MemoryBlock* b=sg_mallocs->get_element_ptr(idx);

diff --git a/src/shogun/base/init.cpp b/src/shogun/base/init.cpp
@@ -11,12 +11,12 @@
 #include <shogun/base/init.h>
 #include <shogun/mathematics/Math.h>
 #include <shogun/lib/memory.h>
-#include <shogun/lib/Set.h>
+#include <shogun/lib/Map.h>
 #include <shogun/base/Parallel.h>
 #include <shogun/base/Version.h>
 
 #ifdef TRACE_MEMORY_ALLOCS
-shogun::CSet<shogun::MemoryBlock>* sg_mallocs=NULL;
+shogun::CMap<void*, shogun::MemoryBlock>* sg_mallocs=NULL;
 #endif
 
 namespace shogun
@@ -54,7 +54,7 @@ namespace shogun
 			sg_math = new shogun::CMath();
 #ifdef TRACE_MEMORY_ALLOCS
 		if (!sg_mallocs)
-			sg_mallocs = new shogun::CSet<MemoryBlock>(631, 1024, false);
+			sg_mallocs = new shogun::CMap<void*, MemoryBlock>(631, 1024, false);
 
 		SG_REF(sg_mallocs);
 #endif
@@ -84,7 +84,7 @@ namespace shogun
 	{
 #ifdef TRACE_MEMORY_ALLOCS
 		list_memory_allocs();
-		shogun::CSet<shogun::MemoryBlock>* mallocs=sg_mallocs;
+		shogun::CMap<void*, shogun::MemoryBlock>* mallocs=sg_mallocs;
 		sg_mallocs=NULL;
 		SG_UNREF(mallocs);
 #endif