Undo previous commit: itk MemoryUsageObserver slows down vv

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index c809743502a0f162a167cce3922c78bd403ea1ef..2060486baad50703accf39863addd1f41598df6d 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -37,6 +37,16 @@ SET(clitkCommon_SRC
 ### Declare clitkCommon library
 ADD_LIBRARY(clitkCommon STATIC ${clitkCommon_SRC})
 
+### if LIBSTATGRAB is installed, add clitkMemoryUsage.cxx in the library
+IF(CLITK_MEMORY_INFO)
+  FIND_PROGRAM(LIBSTATGRAB NAMES statgrab PATHS)
+  IF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+    MESSAGE( FATAL_ERROR "libstatgrab NOT FOUND -> please install http://www.i-scream.org/libstatgrab/")
+  ELSE (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+    TARGET_LINK_LIBRARIES(clitkCommon statgrab)
+  ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")  
+ENDIF(CLITK_MEMORY_INFO)
+
 TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging vtkHybrid ITKBasicFilters)
 
 ADD_LIBRARY(clitkDicomRTStruct STATIC

diff --git a/common/clitkMemoryUsage.cxx b/common/clitkMemoryUsage.cxx
index 7e0079e80b987ee5acc2ba33eaea3df10dbafa25..8ceff61a1e4c90cc55363de927b375e143ddb087 100644 (file)
--- a/common/clitkMemoryUsage.cxx
+++ b/common/clitkMemoryUsage.cxx
@@ -20,9 +20,6 @@
 #include "clitkCommon.h"
 #include "clitkMemoryUsage.h"
 
-// itk include
-#include "itkMemoryUsageObserver.h"
-
 void clitk::PrintMemory(bool verbose, std::string s) 
 {
 #if CLITK_MEMORY_INFO == 1
@@ -32,13 +29,25 @@ void clitk::PrintMemory(bool verbose, std::string s)
     if (s != "") std::cout << "==> " << s << ": ";
     std::cout << mem << "MB (" << mem-previous << "MB)" << std::endl;
     previous = mem;
+    //DD(stat[i].proc_resident/1000/1000);
+    //DD(stat[i].pid);
   }
 #endif
-}
+  }
 
 double clitk::GetMemoryUsageInMb() 
 {
-  itk::MemoryUsageObserver memUsage;
-  return memUsage.GetMemoryUsage() / 1024.;
-}
+#if CLITK_MEMORY_INFO == 1
+  //sleep(1); // wait to refresh memory ? need to let the system refresh the mem
+  int * entries = new int;
+  sg_process_stats * stat = new sg_process_stats;
+  int i=0; 
+  stat = sg_get_process_stats(entries);
+  // Search the current pid in the list of processes
+  while (stat[i].pid != getpid()) i++;
+  // Display total memory size 
+  double mem = stat[i].proc_resident/1024/1024; // in Mb
+  return mem;
+#endif
+  }
 

diff --git a/common/clitkMemoryUsage.h b/common/clitkMemoryUsage.h
index a0dc86536c5cb451f6729b44ed3d63f8fc007121..38a982ea0bdf6bd8c5217f2a67b74c1d1a82d7d3 100644 (file)
--- a/common/clitkMemoryUsage.h
+++ b/common/clitkMemoryUsage.h
@@ -22,6 +22,11 @@
 // clitk include
 #include "clitkConfiguration.h"
 
+// statgrab include
+#if CLITK_MEMORY_INFO == 1
+#include <statgrab.h>
+#endif
+
 //--------------------------------------------------------------------
 namespace clitk {