Let outdir be created from rank 0.

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index 03423c503de8cffd978ca48a5ab44dce2625475a..e10a9d446da6e4db3e0109a0628239b4ceaa54bc 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -11,6 +11,8 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include <boost/filesystem.hpp>
+
 using namespace std;
 
 string writeout::tstamp(const long& timestamp)
@@ -53,7 +55,14 @@ writeout::writeout(const string& wdir, const string& _signature,
     sprintf(cRank, "%d", rank);
     fulldir = wdir + "/" + tstamp(timestamp) + "_" + signature + ".tmp";
 
-    mkdir(fulldir.c_str(), 0775);
+    if (rank==0)
+      mkdir(fulldir.c_str(), 0775);
+    else {
+      while ( ! ( boost::filesystem::exists(fulldir) && boost::filesystem::is_directory(fulldir) ) ) {
+       cerr << "WRITOUT: Waiting for rank 0 to create out directory." << endl << flush;
+       sleep(1);
+      }
+    }
 
     logf.open( (fulldir + "/rank" + cRank + ".log").c_str() );
 
@@ -130,6 +139,7 @@ string writeout::getdatfile(string subname)
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {
     logf << "Error(" << errno << ") opening " << fulldir << endl;
+    closedir(dp);
     return "";
   }
   
@@ -139,9 +149,11 @@ string writeout::getdatfile(string subname)
 
       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;
       }
     }
 
+  closedir(dp);
   return "";
 }