X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/4d3aa1df919cc19d1bf2f66e5272d9ecda95d463..1a5483766d4056eec087099f2e411aef51b63cf5:/writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 81f1e02..03423c5 100644
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -13,68 +13,62 @@
 
 using namespace std;
 
-bool writeout::DirectoryExists( const char* pzPath )
+string writeout::tstamp(const long& timestamp)
 {
-    if ( pzPath == NULL) return false;
+  stringstream sstr;
+  if(!timestamp) sstr << time (NULL);
+  else sstr << timestamp;
+  return sstr.str();
+}
 
-    DIR *pDir;
-    bool bExists = false;
+void writeout::newsub(string subname) {
+  of[subname] = new ofstream;
 
-    pDir = opendir (pzPath);
+  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 (pDir != NULL)
-    {
-        bExists = true;    
-        (void) closedir (pDir);
+    if ( !of[subname]->is_open() ) {
+      logf << "WRITEOUT: Could not open output-file!" << endl << flush;
+      exit(1);
     }
 
-    return bExists;
-}
+    buf[subname] = of[subname]->rdbuf();
+  }
+  else
+    buf[subname] = cout.rdbuf();
 
-string writeout::tstamp(const long& timestamp)
-{
-  stringstream sstr;
-  if(!timestamp) sstr << time (NULL);
-  else sstr << timestamp;
-  return sstr.str();
+  out[subname] = new ostream(buf[subname]);
 }
 
-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)
 {
+  fulldir = "";
+  signature = _signature;
+  rank = _rank;
+
   if(wdir != ""){
     numprocs = procs;
     sprintf(cRank, "%d", rank);
     fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";
 
-    for(int itry=0; itry<100 && (!DirectoryExists(fulldir.c_str())); itry++) {
-      if (rank==0) 
-	mkdir( fulldir.c_str(), 0775);
-      sleep(1);
-    }
-
-    if(rank>0) of.open( (fulldir + "/rank" + cRank + ".tmp").c_str() );
-    else of.open( (fulldir + "/" + signature + ".dat").c_str() );
+    mkdir(fulldir.c_str(), 0775);
 
     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;
     
-    buf = of.rdbuf();
     logbuf = logf.rdbuf();
-
-    cout << buf << endl;
   }
   else{
-    buf = cout.rdbuf();
     logbuf = cerr.rdbuf();
   }
-  out = new ostream(buf);
   log = new ostream(logbuf);
 }
 
@@ -89,47 +83,46 @@ string writeout::timestring()
 
 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();
 }
 
-string writeout::getdatfile()
+string writeout::getdatfile(string subname)
 {
   string myfile;
   DIR *dp;
@@ -143,8 +136,11 @@ string writeout::getdatfile()
   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 ) ) {
 	return myfile;
+      }
     }
 
   return "";