X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/f22a863cf42971e874834d74a152b972f5dc6a03..4d3aa1df919cc19d1bf2f66e5272d9ecda95d463:/writeout.cpp?ds=sidebyside

diff --git a/writeout.cpp b/writeout.cpp
index 67e90d3..81f1e02 100644
--- a/writeout.cpp
+++ b/writeout.cpp
@@ -13,6 +13,24 @@
 
 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;
@@ -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)
 {
-  struct stat sb;
-
   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
-      while ( ! (stat(fulldir.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode)) )
-	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() );
@@ -85,7 +100,7 @@ writeout::~writeout()
 	      if( (nextfile=getdatfile()) == "" ) sleep(1);
 	      else
 		{
-		  cerr << "collecting " << nextfile << endl;
+		  logf << "collecting " << nextfile << endl;
 
 		  ifstream myfile( (fulldir + "/" + nextfile).c_str() );
 		  while(true){
@@ -121,7 +136,7 @@ string writeout::getdatfile()
   struct dirent *dirp;
 
   if((dp  = opendir(fulldir.c_str())) == NULL) {
-    cerr << "Error(" << errno << ") opening " << fulldir << endl;
+    logf << "Error(" << errno << ") opening " << fulldir << endl;
     return "";
   }