X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/2e2c5c148405f6b0c68608083204c2c1854adcfd..3db2602cfe30c61445e89cc334541ebb4ff76ed8:/configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 62b9fdb..a3490ad 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -172,9 +172,12 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-bool configcache::readConfig()
+/* returns number of equilibration-steps left */
+int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
 {
-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
+  int nequileft = NEQUI;
+
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -183,15 +186,29 @@ bool configcache::readConfig()
 
   while(true)
     {
-      if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
+      if( (!inFile.is_open()) && inFiles.size() == 0 ) return nequileft;
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
-	if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+	bool excludethisfile=false;
 
 	openFileDesc = inFiles.back();
-	inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
-	inFiles.pop_back();
 
+	if (excludeFileHashes != NULL)
+	  for (vector<unsigned long>::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit)
+	    if ( *exit == hash(inFiles.back().filename) ) {
+	      excludethisfile = true;
+	      break;
+	    }
+	      
+	if ( ! excludethisfile ) {
+	  if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+	  inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
+	}
+	else
+	  if(out) *out->log << "CCACHE: Excluded dat-file: " << inFiles.back().filename << endl << flush;
+	
+	inFiles.pop_back();
+	
 	if( !inFile.is_open() ) continue;
 
 	inBuffer = new boost::iostreams::filtering_istreambuf;
@@ -207,13 +224,17 @@ bool configcache::readConfig()
 	    for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
 	      if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
 		break;
+	      else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
+		memcpy(configMem, tmpConfig, configSize);
+		nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
+	      }
 	    }
 	  }
 
 	  if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
-	      return true;
+	      return -1;
 	    }
 	  else {
 	    if(out) *out->log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
@@ -228,7 +249,8 @@ void configcache::openOutFile()
   time_t secstamp = time(NULL);
 
   outFileName.str("");
-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";    
+  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";
+
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
   outBuffer = new boost::iostreams::filtering_ostreambuf;
@@ -236,7 +258,7 @@ void configcache::openOutFile()
   outBuffer->push(outFile);
 }
 
-void configcache::writeHeader(const string& headerid, char *header, long unsigned int size) {
+void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size) {
   unsigned long headeridhash;
 
   if( DATADIR == "" || MODE < 2 ) return;