X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/4d4c1c97b3e05fc15c7ebac8d5237ad1b8844230..b8c3dcf5e075cc961b2693b1fcb8d1b8604e8f7c:/writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index eb14309..3849ac9 100644
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -9,34 +9,60 @@
 #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;
-    mkdir( fulldir.c_str(),  0775);
+    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() );
+
+    if ( (!of.is_open()) || (!logf.is_open()) ) {
+      cerr << "WRITEOUT: Could not open output- and/or log-file!" << endl << flush;
+      exit(1);
+    }
+
+    logf << "[ " << timestring() << " ] Log starts here." << endl;
+    
     buf = of.rdbuf();
+    logbuf = logf.rdbuf();
+
+    cout << buf << endl;
   }
   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()
@@ -52,7 +78,7 @@ writeout::~writeout()
 	      if( (nextfile=getdatfile()) == "" ) sleep(1);
 	      else
 		{
-		  cerr << "collecting " << nextfile << endl;
+		  logf << "collecting " << nextfile << endl;
 
 		  ifstream myfile( (fulldir + "/" + nextfile).c_str() );
 		  while(true){
@@ -68,6 +94,7 @@ writeout::~writeout()
 	    }
 	  of << "#end" << endl << flush;
 	  of.close();
+	  rename( fulldir.c_str(), fulldir.substr(0, fulldir.length()-4).c_str() );
 	}
       else
 	{
@@ -76,6 +103,8 @@ writeout::~writeout()
 		 (fulldir + "/rank" + cRank + ".part").c_str());
 	}
     }
+  logf << "[ " << timestring() << " ] Log ends here." << endl;
+  logf.close();
 }
 
 string writeout::getdatfile()
@@ -85,7 +114,7 @@ string writeout::getdatfile()
   struct dirent *dirp;
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {
-    cerr << "Error(" << errno << ") opening " << fulldir << endl;
+    logf << "Error(" << errno << ") opening " << fulldir << endl;
     return "";
   }