Changeset 2255 in Sophya for trunk/SophyaLib/SysTools/resusage.cc

Timestamp:

Nov 8, 2002, 12:26:22 AM (23 years ago)

Author:

perderos

Message:

modifs pour lecture des infos de memoire sur Linux
O Perdereau LAL Orsay

File:

• trunk/SophyaLib/SysTools/resusage.cc (modified) (5 diffs)

trunk/SophyaLib/SysTools/resusage.cc

@@ -1 +1 @@
 #include "resusage.h"
 
+#include <typeinfo>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 #include <sys/resource.h>
 #include <unistd.h>
 #include <time.h>
-
+#include <fcntl.h>
+#include <fstream.h>
+#include <stdio.h>
+#include <string>
 /*!
   \class SOPHYA::ResourceUsage
@@ -46 +51 @@
   getrlimit(RLIMIT_STACK, &rl);
   max_stack = rl.rlim_cur/1024;
+#if defined(Linux)
+  // recuperation des limites sous Linux 
+  // car je ne comprends pas ce que renc=voie getrlimit
+  // OPerdereau LAL Orsay  11/2002
+  ReadLinuxTotMem();
+#endif
 
   cur_datasz = 0;
@@ -58 +69 @@
   delta_tottm = 0;
   delta_elapsed_time = 0;
+  cur_pid = getpid();
   Update();
   
@@ -86 +98 @@
   cur_systm = s_timeval2msec(rsu.ru_stime);
   cur_tottm = cur_usrtm+cur_systm;
+  delta_tottm = cur_tottm-delta_tottm;
+
+#if defined(Linux)
+  // Recuperation de la place en memoire ss Linux 
+  ReadLinuxMem();
+#else
   cur_rss = rsu.ru_maxrss;
   cur_datasz = rsu.ru_idrss;
   cur_stack = rsu.ru_isrss;
-  delta_tottm = cur_tottm-delta_tottm;
+#endif
+
   delta_rss = cur_rss-delta_rss;
-
   delta_elapsed_time = elapsed_time;
   time_t tm = time(NULL);
@@ -128 +146 @@
      << " kbytes" << endl;
 }
+/*!
+     Recuperation de la place en memoire ss Linux 
+     ecrit d'apres les sources du code de top 
+     O. Perdereau LAL Orsay 11/2002
+
+*/  
+void ResourceUsage::ReadLinuxMem(){ 
+
+#if defined(Linux)
+
+  char flnm[120];
+  
+  sprintf(flnm,"/proc/%d/statm",(int)cur_pid);
+  ifstream fich(flnm) ;
+
+ 
+  long lia,lib,lic,lid,lie,lif,lig;
+  
+  fich >> lia >> lib >> lic >> lid >> lie >> lif >> lig ;
+
+  cur_rss = lia*4; // les valeurs sont en pages de 4 k 
+  cur_datasz = lib*4;
+  cur_stack = lic*4;
+
+#endif
+
+}
+
+
+/*! 
+   Recuperation de la memoire dispo ss Linux 
+   ecrit d'apres les sources du code de top 
+   O. Perdereau LAL Orsay 11/2002
+*/
+void ResourceUsage::ReadLinuxTotMem(){
+#if defined(Linux)
+
+  char flnm[]="/proc/meminfo";
+  char buff[512];
+  ifstream fich(flnm) ;
+
+  fich.getline(buff,200); // on saute une ligne 
+
+  string tst;
+  long lia,lib,lic,lid,lie,lif;
+  fich >> tst >> lia >> lib >> lic >> lid >> lie >> lif;
+
+  max_rss = lia/1024; // conversion  en kbytes  
+
+#endif
+
+}