X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkMemoryUsage.cxx;h=12cb91c791f3dd2d3b881d3ac808b53a558168b7;hb=9548105324e0d1e8d440a1e1d83faf37ebcf1c08;hp=295ac2975e5d90e616c3a240211243cb4544a36a;hpb=62c08c838c8d824b37b908bbed67b996aaaa31ac;p=clitk.git

diff --git a/common/clitkMemoryUsage.cxx b/common/clitkMemoryUsage.cxx
index 295ac29..12cb91c 100644
--- a/common/clitkMemoryUsage.cxx
+++ b/common/clitkMemoryUsage.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to: 
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 
 // clitk include
 #include "clitkCommon.h"
@@ -24,22 +24,32 @@ void clitk::PrintMemory(bool verbose, std::string s)
 {
 #if CLITK_MEMORY_INFO == 1
   if (verbose) {
-      //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 
-      if (s != "") std::cout << "==> " << s << ": ";
-      static int previous=0;
-      int mem = stat[i].proc_size/1000/1000; // in Mb
-      std::cout << mem << "Mb (" << mem-previous << "Mb)" << std::endl;
-      previous = mem;
-      //DD(stat[i].proc_resident/1000/1000);
-      //DD(stat[i].pid);
-    }
+    static double previous=0;
+    double mem = GetMemoryUsageInMb();
+    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() 
+{
+#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;
+#else
+  return 0.0;
 #endif
   }