more conservative output-dir creation

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 0cb486caf5ecbb5942593cc269dea78e5c3cc562..67e90d3b3b9f54fb826d3aa8a554010cd7e3e492 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -9,6 +9,7 @@
 #include <sstream>
 #include <dirent.h>
 #include <errno.h>
 #include <sstream>
 #include <dirent.h>
 #include <errno.h>

+#include <unistd.h>

 
 using namespace std;
 
 
 using namespace std;
 


@@ -23,21 +24,52 @@ string writeout::tstamp(const long& timestamp)
 writeout::writeout(const string& wdir, const string& signature, 
                   const int& rank, const int& procs, const long& timestamp)
 {
 writeout::writeout(const string& wdir, const string& signature, 
                   const int& rank, const int& procs, const long& timestamp)
 {

+  struct stat sb;
+

   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
     fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
     fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";

-    mkdir( fulldir.c_str(),  0775);
+
+    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() );
 
 
     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();
     buf = of.rdbuf();

+    logbuf = logf.rdbuf();
+
+    cout << buf << endl;

   }
   else{
     buf = cout.rdbuf();
   }
   else{
     buf = cout.rdbuf();

+    logbuf = cerr.rdbuf();

   }
   out = new ostream(buf);
   }
   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()
 }
 
 writeout::~writeout()


@@ -78,6 +110,8 @@ writeout::~writeout()
                 (fulldir + "/rank" + cRank + ".part").c_str());
        }
     }
                 (fulldir + "/rank" + cRank + ".part").c_str());
        }
     }

+  logf << "[ " << timestring() << " ] Log ends here." << endl;
+  logf.close();

 }
 
 string writeout::getdatfile()
 }
 
 string writeout::getdatfile()