...

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 4fb68e12a64f5b0a795be0ad86c82037d05533ac..9a5409de4e16e0fdda1e654f2179f6364ef8034d 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -9,34 +9,52 @@
 #include <sstream>
 #include <dirent.h>
 #include <errno.h>
+#include <unistd.h>
 
 using namespace std;
 
-string writeout::tstamp()
+string writeout::tstamp(const long& timestamp)
 {
-    stringstream sstr;
-    sstr << time (NULL);
-    return sstr.str();
+  stringstream sstr;
+  if(!timestamp) sstr << time (NULL);
+  else sstr << timestamp;
+  return sstr.str();
 }
 
 writeout::writeout(const string& wdir, const string& signature, 
-                  const int& rank, const int& procs)
+                  const int& rank, const int& procs, const long& timestamp)
 {
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
-    fulldir = wdir + "/" + tstamp() + "_" + signature;
+    fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";
     mkdir( fulldir.c_str(),  0775);
 
     if(rank>0) of.open( (fulldir + "/rank" + cRank + ".tmp").c_str() );
     else of.open( (fulldir + "/" + signature + ".dat").c_str() );
 
+    logf.open( (fulldir + "/rank" + cRank + ".log").c_str() );
+
+    logf << "[ " << timestring() << " ] Log starts here." << endl;
+    
     buf = of.rdbuf();
+    logbuf = logf.rdbuf();
   }
   else{
     buf = cout.rdbuf();
+    logbuf = cerr.rdbuf();
   }
   out = new ostream(buf);
+  log = new ostream(logbuf);
+}
+
+string writeout::timestring()
+{
+  time_t rawtime;
+  string timestring;
+  time( &rawtime );
+  timestring = asctime( localtime( &rawtime ) );
+  return timestring.substr(0, timestring.size()-1);;
 }
 
 writeout::~writeout()
@@ -55,20 +73,20 @@ writeout::~writeout()
                  cerr << "collecting " << nextfile << endl;
 
                  ifstream myfile( (fulldir + "/" + nextfile).c_str() );
-                 while(myfile.good()){
+                 while(true){
                    string line;
                    getline(myfile, line);
-                   of << line << flush;
+                   if( !myfile.good() ) break;
+                   of << line << endl << flush;
                  }
                  myfile.close();
-                 of << endl << flush;
-
                  remove( (fulldir + "/" + nextfile).c_str() );
                  jobsdone++;
                }
            }
          of << "#end" << endl << flush;
          of.close();
+         rename( fulldir.c_str(), fulldir.substr(0, fulldir.length()-4).c_str() );
        }
       else
        {
@@ -77,6 +95,8 @@ writeout::~writeout()
                 (fulldir + "/rank" + cRank + ".part").c_str());
        }
     }
+  logf << "[ " << timestring() << " ] Log ends here." << endl;
+  logf.close();
 }
 
 string writeout::getdatfile()