X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/594f56b186b5d2f5e25293d6952c9325576aa080..894e6b60d1de6307a72b03d0027f71962bc2e282:/configcache.cpp?ds=inline

diff --git a/configcache.cpp b/configcache.cpp
index 34789ee..bdc593e 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>
@@ -50,13 +53,22 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   refetchDataFiles = false;
 }
 
+string configcache::paraString() {
+  stringstream parastring;
+
+  for(int ipara=0; ipara<Paras.size(); ipara++)
+    parastring << "_" << Paras[ipara].id << Paras[ipara].val;
+  
+  return parastring.str();
+}
+
 string configcache::getFileId(int actnequi, const bool& shortid)
 {
   stringstream fileid;
 
   if(!shortid) fileid << CACHEID << "_" << actnequi << "_" << NSKIP;
-  for(int ipara=0; ipara<Paras.size(); ipara++)
-    fileid << "_" << Paras[ipara].id << Paras[ipara].val;
+
+  fileid << "_" << hash( paraString() );
 
   return fileid.str();
 }
@@ -210,6 +222,8 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
       }
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
+	string inFileParaString;
+
 	openFileDesc = *inFileIt;
 
 	if (openFileDesc.nequi < NEQUI)
@@ -222,6 +236,12 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 	if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
 	inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
 	
+	getline( inFile, inFileParaString );
+	if( inFileParaString != paraString() ) {
+	  if(log) *log << "CCACHE: Parastring does not match. Closing dat-file..." << endl << flush;
+	  inFile.close();
+	}
+
 	inFiles.erase(inFileIt);
 	
 	if( !inFile.is_open() ) continue;
@@ -274,12 +294,30 @@ 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";
 
-  outFileName.str("");
-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId(actnequi) << "_.edat.tmp";
+    int tmpfd = open(outFileName.str().c_str(), O_CREAT | O_EXCL, 0644);
+
+    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 );
 
+  outFile << paraString() << endl;
+
   ioBuffers->out = new boost::iostreams::filtering_ostreambuf;
   ioBuffers->out->push(boost::iostreams::bzip2_compressor());
   ioBuffers->out->push(outFile);