X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/0391c237272d90acfc769f4aeebe0554d47f74cb..ebc593f61243a8ead77dbe9128fdac77377d6734:/configcache.cpp?ds=inline

diff --git a/configcache.cpp b/configcache.cpp
index c6f9082..5987789 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -4,6 +4,9 @@
 #include <iostream>
 #include <time.h>
 #include <dirent.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>
@@ -191,7 +194,7 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 {
   *readnewconfig = false;
 
-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
+  if( DATADIR == "" || !(MODE==CACHE_MODE_RO||MODE==CACHE_MODE_RW) ) return;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -274,10 +277,26 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 void configcache::openOutFile(int actnequi)
 { 
   time_t secstamp = time(NULL);
+  int iseq=0;
+  
+  while (true) {
+    outFileName.str("");
+    outFileName << DATADIR << "/" << secstamp << "." << iseq << "_" << getFileId(actnequi) << "_.edat.tmp";
+
+    int tmpfd = open(outFileName.str().c_str(), O_CREAT | O_EXCL, 0644);
 
-  outFileName.str("");
-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId(actnequi) << "_.edat.tmp";
+    if ( tmpfd != -1 ) {
+      close(tmpfd);
+      break;
+    }
+    else if ( errno != EEXIST ) {
+      if(log) *log << "CCACHE: Could not create cachefile!" << endl << flush;
+      exit(1);
+    }
 
+    iseq++;
+  }
+  
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
   ioBuffers->out = new boost::iostreams::filtering_ostreambuf;
@@ -288,7 +307,7 @@ void configcache::openOutFile(int actnequi)
 void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {
   unsigned long headeridhash;
 
-  if( DATADIR == "" || MODE < 2 ) return;
+  if( DATADIR == "" || !(MODE==CACHE_MODE_WO||MODE==CACHE_MODE_RW) ) return;
 
   if(!outFile.is_open())
     openOutFile(actnequi);
@@ -304,7 +323,7 @@ void configcache::writeConfig(int actnequi)
 {
   long unsigned int zeroheader=0;
 
-  if ( DATADIR == "" || MODE < 2 ) return;
+  if ( DATADIR == "" || !(MODE==CACHE_MODE_WO||MODE==CACHE_MODE_RW) ) return;
 
   if ( ! outFile.is_open() )
     openOutFile(actnequi);