Added writeoutdir sequencing for equal timestamps.

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 3849ac9bab479c02fc944dd32be082ca848f25e0..9fc40f515be82f05c6e7671bd494f4e32f988ce0 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -10,49 +10,96 @@
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>

+#include <mpi.h>

 
 using namespace std;
 
 
 using namespace std;
 

-string writeout::tstamp(const long& timestamp)
+string writeout::longToStr (long arg)

 {
 {

-  stringstream sstr;
-  if(!timestamp) sstr << time (NULL);
-  else sstr << timestamp;
-  return sstr.str();
+  stringstream ss;
+  ss << arg;
+  return ss.str();

 }
 
 }
 

-writeout::writeout(const string& wdir, const string& signature, 
-                  const int& rank, const int& procs, const long& timestamp)
+void writeout::newsub(string subname) {
+  of[subname] = new ofstream;
+
+  if ( fulldir != "" ) {
+    if(rank>0) of[subname]->open( (fulldir + "/rank" + cRank + "-" + subname + ".tmp").c_str() );
+    else of[subname]->open( (fulldir + "/" + signature + "-" + subname + ".dat").c_str() );
+
+    if ( !of[subname]->is_open() ) {
+      logf << "WRITEOUT: Could not open output-file!" << endl << flush;
+      exit(1);
+    }
+
+    buf[subname] = of[subname]->rdbuf();
+  }
+  else
+    buf[subname] = cout.rdbuf();
+
+  out[subname] = new ostream(buf[subname]);
+}
+
+writeout::writeout(const string& wdir, const string& _signature, 
+                  const int& _rank, const int& procs)

 {
 {

+  long timestamp;
+  int iseq=0;
+
+  fulldir = "";
+  signature = _signature;
+  rank = _rank;
+

   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);

-    fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";

 
 

-    mkdir(fulldir.c_str(), 0775);
+    if (rank == 0) {
+      timestamp = time(NULL);

 
 

-    if(rank>0) of.open( (fulldir + "/rank" + cRank + ".tmp").c_str() );
-    else of.open( (fulldir + "/" + signature + ".dat").c_str() );
+      while (true) {
+       fulldir = wdir + "/" + longToStr(timestamp) + "." + longToStr(iseq) + "_" + signature + ".tmp";
+       if ( mkdir(fulldir.c_str(), 0775) == 0 )
+         break;
+       else if ( errno != EEXIST ) {
+         cerr << "WRITEOUT: Could not create outdir!" << endl << flush;
+         break;
+       }
+       iseq++;
+      }
+
+#ifndef MPI_DISABLED
+      for(int idest=1; idest<numprocs; idest++) {
+       MPI_Send(&timestamp, 1, MPI_LONG, idest, 123, MPI_COMM_WORLD);
+       MPI_Send(&iseq, 1, MPI_LONG, idest, 124, MPI_COMM_WORLD);
+      }
+#endif
+
+    }

 
 

+#ifndef MPI_DISABLED
+    else if(rank>0) {
+      MPI_Recv(&timestamp, 1, MPI_LONG, 0, 123, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+      MPI_Recv(&iseq, 1, MPI_LONG, 0, 124, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+      fulldir = wdir + "/" + longToStr(timestamp) + "." + longToStr(iseq) + "_" + signature + ".tmp";
+    }
+#endif  
+    

     logf.open( (fulldir + "/rank" + cRank + ".log").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;
+    if ( !logf.is_open() ) {
+      cerr << "WRITEOUT: Could not open log-file!" << endl << flush;

       exit(1);
     }
 
     logf << "[ " << timestring() << " ] Log starts here." << endl;
     
       exit(1);
     }
 
     logf << "[ " << timestring() << " ] Log starts here." << endl;
     

-    buf = of.rdbuf();

     logbuf = logf.rdbuf();
     logbuf = logf.rdbuf();

-
-    cout << buf << endl;

   }
   else{
   }
   else{

-    buf = cout.rdbuf();

     logbuf = cerr.rdbuf();
   }
     logbuf = cerr.rdbuf();
   }

-  out = new ostream(buf);

   log = new ostream(logbuf);
 }
 
   log = new ostream(logbuf);
 }
 


@@ -67,47 +114,46 @@ string writeout::timestring()
 
 writeout::~writeout()
 {
 
 writeout::~writeout()
 {

-  if(fulldir != "")
-    {
-      if( cRank[0] == '0' )
-       {
-         int jobsdone=0;
-         while(jobsdone<numprocs-1)
-           {
-             string nextfile;
-             if( (nextfile=getdatfile()) == "" ) sleep(1);
-             else
-               {
-                 logf << "collecting " << nextfile << endl;
-
-                 ifstream myfile( (fulldir + "/" + nextfile).c_str() );
-                 while(true){
-                   string line;
-                   getline(myfile, line);
-                   if( !myfile.good() ) break;
-                   of << line << endl << flush;
-                 }
-                 myfile.close();
-                 remove( (fulldir + "/" + nextfile).c_str() );
-                 jobsdone++;
-               }
+  if(fulldir != "") {
+    for (map<string,ofstream*>::iterator ofit = of.begin(); ofit != of.end(); ++ofit) {
+      if( cRank[0] == '0' ) {
+       int jobsdone=0;
+       while(jobsdone<numprocs-1) {
+         string nextfile;
+         if( (nextfile = getdatfile(ofit->first)) == "" ) 
+           sleep(1);
+         else {
+           logf << "collecting " << nextfile << endl;
+                   
+           ifstream myfile( (fulldir + "/" + nextfile).c_str() );
+           while(true) {
+             string line;
+             getline(myfile, line);
+             if( !myfile.good() ) break;
+             *ofit->second << line << endl << flush;

            }
            }

-         of << "#end" << endl << flush;
-         of.close();
-         rename( fulldir.c_str(), fulldir.substr(0, fulldir.length()-4).c_str() );
-       }
-      else
-       {
-         of.close();
-         rename((fulldir + "/rank" + cRank + ".tmp").c_str(),
-                (fulldir + "/rank" + cRank + ".part").c_str());
+           myfile.close();
+           remove( (fulldir + "/" + nextfile).c_str() );
+           jobsdone++;
+         }

        }
        }

+       *ofit->second << "#end" << endl << flush;
+       ofit->second->close();
+      }
+      else {
+       ofit->second->close();
+       rename((fulldir + "/rank" + cRank + "-" + ofit->first + ".tmp").c_str(),
+              (fulldir + "/rank" + cRank + "-" + ofit->first + ".part").c_str());
+      }

     }
     }

+    if( cRank[0] == '0' )
+      rename( fulldir.c_str(), fulldir.substr(0, fulldir.length()-4).c_str() );
+  }

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

-string writeout::getdatfile()
+string writeout::getdatfile(string subname)

 {
   string myfile;
   DIR *dp;
 {
   string myfile;
   DIR *dp;


@@ -115,15 +161,21 @@ string writeout::getdatfile()
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {
     logf << "Error(" << errno << ") opening " << fulldir << endl;
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {
     logf << "Error(" << errno << ") opening " << fulldir << endl;

+    closedir(dp);

     return "";
   }
   
   while ((dirp = readdir(dp)) != NULL)
     {
       myfile = string(dirp->d_name);
     return "";
   }
   
   while ((dirp = readdir(dp)) != NULL)
     {
       myfile = string(dirp->d_name);

-      if(myfile.length() > 3 && myfile.substr(myfile.length()-4) == "part")
+
+      if(myfile.length() > 3 && myfile.substr(myfile.length()-4) == "part" &&
+        subname == myfile.substr( myfile.find("-")+1, myfile.rfind(".")-myfile.find("-")-1 ) ) {
+       closedir(dp);

        return myfile;
        return myfile;

+      }

     }
 
     }
 

+  closedir(dp);

   return "";
 }
   return "";
 }