Changeset 3636 in Sophya

Timestamp:

May 26, 2009, 10:24:24 PM (16 years ago)

Author:

ansari

Message:

Petites correction/amelioration de la classe Timer - Reza 26/05/2009

Location:

trunk/SophyaLib/SysTools

Files:

• ctimer.cc (modified) (6 diffs)
• ctimer.h (modified) (5 diffs)

trunk/SophyaLib/SysTools/ctimer.cc

@@ -1 +1 @@
 //
-// $Id: ctimer.cc,v 1.8 2009-02-20 11:07:02 ansari Exp $
+// $Id: ctimer.cc,v 1.9 2009-05-26 20:24:23 ansari Exp $
 //
 
 #include "machdefs.h"
-#include "sopnamsp.h"
 #include "ctimer.h"
 
@@ -46 +45 @@
 */
 
+namespace SOPHYA {
 /*! 
   \brief Constructor with the specification of a optional name or message 
@@ -76 +76 @@
     timer name
 */
-void Timer::Split(const char* comm, bool prfg)
+void Timer::SplitQ()
 {
   struct timeval elapse; 
@@ -104 +104 @@
   elapseSplit = elapse;
   cpuSplit    = cpu;
+}
 
+void Timer::Split(const char* comm, bool prfg)
+{
+  SplitQ();
   if ( !defprtflg && !prfg )  return;
-
   cout << "***Timing " << (comm ? comm : timerName.c_str()) << endl;
+  Print(cout);
+}
 
 // Pour des formats comme ca, la syntaxe printf est plus agreable.
 // Pour ne pas melanger stdio/iostream (pb de desynchronisation sur
 // autres C++ que GNU), on fait un cout << chaine.
+
+
+ostream& Timer::Print(ostream& os) const
+{
 
   int_4 etm  = elapSecP/1000;
@@ -119 +128 @@
   sprintf(out,"CPU     Time: Total= %lg (Partial= %lg) s",
           cpuSecT, cpuSecP);
-  cout << out << endl;
+  os << out << endl;
 
   if (etmt<60) {
     int_4 etmtms = elapSecT%1000; 
-    sprintf(out,"%02d.%03d ms", etmt, etmtms);
+    sprintf(out,"%02d.%03d s", etmt, etmtms);
   }
   else
@@ -130 +139 @@
   if (etm<60) {
     int_4 etmms = elapSecT%1000; 
-    sprintf(outp,"%02d.%03d ms", etm, etmms);
+    sprintf(outp,"%02d.%03d s", etm, etmms);
   }
   else
     sprintf(outp,"%02d:%02d:%02d", etm/3600, (etm%3600)/60, etm%60);
         
-  cout << "Elapsed Time: Total=" << out << " (Partial= " << outp << ")" << endl;
+  os << "Elapsed Time: Total=" << out << " (Partial= " << outp << ")" << endl;
 }
 
+} // FIN namespace SOPHYA 

trunk/SophyaLib/SysTools/ctimer.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: ctimer.h,v 1.6 2009-02-20 11:07:02 ansari Exp $
+// $Id: ctimer.h,v 1.7 2009-05-26 20:24:24 ansari Exp $
 //
 
@@ -13 +13 @@
 #include <sys/time.h>
 #include <string>
+#include <iostream>
 
 using namespace std;
@@ -35 +36 @@
   // Si pas de parametre affiche le nom donne a la creation.
   void Split(const char* comm=0, bool prfg=false);
+
+  //! store partial CPU and elapsed time (no print)
+  void SplitQ();
 
   // Sert a eviter que GNU ne pretende qu'on utilise pas l'objet...
@@ -67 +71 @@
   inline double PartialCPUTime() { return  cpuSecP; }
 
+//! Print the CPU and elapsed time on os (partial time corresponding to the last call to Split())
+  ostream& Print(ostream& os) const ;
+//! Print the CPU and elapsed time on cout 
+  inline ostream& Print() const { return Print(cout); }
+
 private:
   clock_t cpu0, cpuSplit;
@@ -76 +85 @@
 };
 
+/*! operator << overloading - Calls SplitQ() and Print() */
+inline ostream& operator << (ostream& s, Timer& tm)
+  {  tm.SplitQ(); tm.Print(s);  return(s);  }
+
 } // namespace SOPHYA