...

[phys/latlib.git] / writeout.cpp

diff --git a/writeout.cpp b/writeout.cpp
index e00356a1b85f7f86f89389155fdfea33a3d53c9e..81f1e02a4359fcd615ae692b6430b13236e68dd3 100644 (file)
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -13,6 +13,24 @@
 
 using namespace std;
 
 
 using namespace std;
 

+bool writeout::DirectoryExists( const char* pzPath )
+{
+    if ( pzPath == NULL) return false;
+
+    DIR *pDir;
+    bool bExists = false;
+
+    pDir = opendir (pzPath);
+
+    if (pDir != NULL)
+    {
+        bExists = true;    
+        (void) closedir (pDir);
+    }
+
+    return bExists;
+}
+

 string writeout::tstamp(const long& timestamp)
 {
   stringstream sstr;
 string writeout::tstamp(const long& timestamp)
 {
   stringstream sstr;


@@ -24,19 +42,16 @@ 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";
 

-    if ( rank == 0 )
-      for (int itry=0; itry < 10 && mkdir( fulldir.c_str(), 0775) != 0; itry++)
-       sleep(1);
-    else
-      for (int itry=0; itry < 100 && (!(stat(fulldir.c_str(), &sb) == 0) && S_ISDIR(sb.st_mode)); itry++)
-       sleep(1);
+    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() );
 
     if(rank>0) of.open( (fulldir + "/rank" + cRank + ".tmp").c_str() );
     else of.open( (fulldir + "/" + signature + ".dat").c_str() );