X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/6441a11e7c0fe2ab5bad813770474858302a88dd..f22a863cf42971e874834d74a152b972f5dc6a03:/writeout.cpp?ds=sidebyside

diff --git a/writeout.cpp b/writeout.cpp
index 4fb68e1..67e90d3 100644
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -9,34 +9,67 @@
 #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)
 {
+  struct stat sb;
+
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
-    fulldir = wdir + "/" + tstamp() + "_" + signature;
-    mkdir( fulldir.c_str(),  0775);
+    fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";
+
+    if ( rank == 0 )
+      for (int itry=0; itry < 10 && mkdir( fulldir.c_str(), 0775) != 0; itry++)
+	sleep(1);
+    else
+      while ( ! (stat(fulldir.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode)) )
+	sleep(1);
 
     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()
@@ -55,20 +88,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 +110,8 @@ writeout::~writeout()
 		 (fulldir + "/rank" + cRank + ".part").c_str());
 	}
     }
+  logf << "[ " << timestring() << " ] Log ends here." << endl;
+  logf.close();
 }
 
 string writeout::getdatfile()