Changeset 2487 in Sophya for trunk/SophyaLib/SysTools

Timestamp:

Dec 26, 2003, 12:19:21 PM (22 years ago)

Author:

ansari

Message:

Possibilite de specifier temps process et/ou process fils ds ResourceUsage - Reza 26 Dec 2003

Location:

trunk/SophyaLib/SysTools

Files:

• resusage.cc (modified) (3 diffs)
• resusage.h (modified) (2 diffs)
• zthread.cc (modified) (1 diff)

trunk/SophyaLib/SysTools/resusage.cc

@@ -36 +36 @@
 /*!
   Constructor. the \b Update() method is called.
-*/
-ResourceUsage::ResourceUsage()
-{
+  \param pg: Process group RU_Self or RU_Children or RU_All
+*/
+ResourceUsage::ResourceUsage(RU_ProcGrp pg)
+{
+  procgrp = pg;
   struct rlimit rl;
   getrlimit(RLIMIT_DATA, &rl);
@@ -92 +94 @@
 {
   struct rusage rsu;
-  int rc = getrusage(RUSAGE_SELF, &rsu);
+  int rc;
+  if ((procgrp == RU_Self) || (procgrp == RU_All)) 
+    rc = getrusage(RUSAGE_SELF, &rsu);
+  else 
+    rc = getrusage(RUSAGE_CHILDREN, &rsu);
+
   delta_tottm = cur_tottm;
   delta_rss = cur_rss;
   cur_usrtm = s_timeval2msec(rsu.ru_utime);
   cur_systm = s_timeval2msec(rsu.ru_stime);
+  if (procgrp == RU_All) {
+    struct rusage rsuch;
+    rc = getrusage(RUSAGE_CHILDREN, &rsuch);
+    cur_usrtm += s_timeval2msec(rsuch.ru_utime);
+    cur_systm += s_timeval2msec(rsuch.ru_stime);    
+  }
   cur_tottm = cur_usrtm+cur_systm;
   delta_tottm = cur_tottm-delta_tottm;
@@ -130 +143 @@
   os << " --------------- ResourceUsage::Print(lp=" << lp 
      <<" ) --------------- " << endl;
-  int load = getAverageCPULoad()*100.;
+  int load = (int)(getAverageCPULoad()*100.);
   os << " CPU-Usage= " << getCPUTime() << " Elapsed= " << getElapsedTime()
      << " msec - Load= " << load << " %" << endl;

trunk/SophyaLib/SysTools/resusage.h

@@ -17 +17 @@
 {
 public:
-  ResourceUsage();
+  enum RU_ProcGrp {RU_Self=0, RU_Children=1, RU_All=2};
+  // RU_Self: Resource usage for the process itself
+  // RU_Children: Resource usage for the child processes
+  // RU_All: Process itself and child processes
+  ResourceUsage(RU_ProcGrp pg=RU_Self);
   ~ResourceUsage();
 
@@ -85 +89 @@
 
 protected:
+  RU_ProcGrp procgrp; // Process group: self, child, all
   uint_8 max_datasz;  // Max data segment size (KBytes)
   uint_8 max_rss;     // Max resident size

trunk/SophyaLib/SysTools/zthread.cc

@@ -17 +17 @@
   \sa SOPHYA::ZMutex
   The following sample code shows the usage of ZThread object 
-  to run simultaneously to functions to perform computation.
+  to run simultaneously two functions to perform computation.
 
   \code