X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/7f5403eed95da4350dcc03d817eb8468dab07142..7ba7584af501689c899b1b311286140d88e23b25:/configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 1095775..6cd46a1 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -10,8 +10,8 @@
 #define HEADER_READLAST 2
 
 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
-			 writeout *out_a){
-  out = out_a;
+			 ostream *_log){
+  log = _log;
 
   NEQUI = nequi;
   NSKIP = nskip;
@@ -131,19 +131,19 @@ int configcache::readHeader()
 	return HEADER_READOK;
       }
       else {
-	if(out) *out->log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush;
+	if(log) *log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush;
 	inFile.close();
 	return HEADER_READERR;
       }
     }
     else {
-      if(out) *out->log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush;
+      if(log) *log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush;
       inFile.close();
       return HEADER_READERR;
     }
   }
   else {
-    if(out) *out->log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush;
+    if(log) *log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush;
     inFile.close();
     return HEADER_READERR;
   }
@@ -172,9 +172,12 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-bool configcache::readConfig(vector<unsigned long> *excludeFileHashes)
-{   
-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
+/* returns number of equilibration-steps left */
+int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
+{
+  int nequileft = NEQUI;
+
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -183,28 +186,17 @@ bool configcache::readConfig(vector<unsigned long> *excludeFileHashes)
 
   while(true)
     {
-      if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
+      vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
 
-      while( (!inFile.is_open()) && inFiles.size() > 0 ) {
-	bool excludethisfile=false;
+      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return nequileft;
 
-	openFileDesc = inFiles.back();
+      while( (!inFile.is_open()) && inFiles.size() > 0 ) {
+	openFileDesc = *inFileIt;
 
-	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;
+	if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
+	inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
 	
-	inFiles.pop_back();
+	inFiles.erase(inFileIt);
 	
 	if( !inFile.is_open() ) continue;
 
@@ -216,21 +208,25 @@ bool configcache::readConfig(vector<unsigned long> *excludeFileHashes)
       if( inFile.is_open() ) 
 	{
 	  if (openFileDesc.doVirtualEquilibration) {
-	    if(out) *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
+	    if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
 	    openFileDesc.doVirtualEquilibration = false;
 	    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;
+	    if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
 	    inFile.close();
 	  }
 	}
@@ -343,15 +339,15 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
 
   try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
   catch(boost::iostreams::bzip2_error& error) { 
-    if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
+    if(log) *log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
     inFile.close();
   } 
   catch (std::exception const& ex) {
-    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
+    if(log) *log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
     inFile.close();
   }
   catch( ... ) {
-    if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
+    if(log) *log << "CCACHE: Caught unknown exception while reading." << endl << flush;
     inFile.close();
   }
 
@@ -375,3 +371,22 @@ void configcache::deleteHeaderStore()
     headerStore.pop_back();
   }
 }
+
+vector<infiledesc>::iterator configcache::getNextInfile(vector<unsigned long> *excludeFileHashes) {
+  for (vector<infiledesc>::iterator init = inFiles.begin(); init != inFiles.end(); ++init) {
+    if (excludeFileHashes != NULL) {
+      bool excludethisfile = false;
+
+      for (vector<unsigned long>::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit)
+	if ( *exit == hash(init->filename) ) {
+	  excludethisfile = true;
+	  break;
+	}
+
+      if (excludethisfile)
+	continue;
+    }
+    return init;
+  }
+  return inFiles.end();
+}