changes in license header

[clitk.git] / common / clitkMemoryUsage.cxx

diff --git a/common/clitkMemoryUsage.cxx b/common/clitkMemoryUsage.cxx
index b588c41f1666f49117ada4e634fad538768dbe6d..12cb91c791f3dd2d3b881d3ac808b53a558168b7 100644 (file)
--- 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"
@@ -27,7 +27,7 @@ void clitk::PrintMemory(bool verbose, std::string s)
     static double previous=0;
     double mem = GetMemoryUsageInMb();
     if (s != "") std::cout << "==> " << s << ": ";
-    std::cout << mem << "Mb (" << mem-previous << "Mb)" << std::endl;
+    std::cout << mem << "MB (" << mem-previous << "MB)" << std::endl;
     previous = mem;
     //DD(stat[i].proc_resident/1000/1000);
     //DD(stat[i].pid);
@@ -46,8 +46,10 @@ double clitk::GetMemoryUsageInMb()
   // Search the current pid in the list of processes
   while (stat[i].pid != getpid()) i++;
   // Display total memory size 
-  double mem = stat[i].proc_size/1000/1000; // in Mb
+  double mem = stat[i].proc_resident/1024/1024; // in Mb
   return mem;
+#else
+  return 0.0;
 #endif
   }