X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/db68c55d4535522352b71a8d69d3a38ba97c67a5..20acc11c8054200c02794f58e3cc63851b5627ff:/configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index bcfe92f..0cabc9d 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -37,11 +37,11 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   refetchDataFiles = false;
 }
 
-string configcache::getFileId(const bool& shortid)
+string configcache::getFileId(int actnequi, const bool& shortid)
 {
   stringstream fileid;
 
-  if(!shortid) fileid << CACHEID << "_" << NEQUI << "_" << NSKIP;
+  if(!shortid) fileid << CACHEID << "_" << actnequi << "_" << NSKIP;
   for(int ipara=0; ipara<Paras.size(); ipara++)
     fileid << "_" << Paras[ipara].id << Paras[ipara].val;
 
@@ -72,7 +72,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   string truncIn, truncOut;
 
   filedesc->filename = infile;
-  filedesc->doVirtualEquilibration = false;
 
   if( infile.size() < 4 ) return false;
 
@@ -93,15 +92,10 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
       switch(iPart)
 	{
-	case 1: if(inParts != CACHEID) {
-	    return false; 
-	    break;
-	  }
-	case 2: 
-	  if (atoi(inParts) > NEQUI) 
-	    return false; 
-	  else if (atoi(inParts) < NEQUI)
-	    filedesc->doVirtualEquilibration = true;
+	case 1: if(inParts != CACHEID)
+	    return false;
+	  break;
+	case 2:
 	  filedesc->nequi = atoi(inParts);
 	  break;
 	case 3: 
@@ -116,7 +110,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   delete[] inchar;
 
-  if( truncIn.find( getFileId(true) + "_" ) == string::npos ) return false;
+  if( truncIn.find( getFileId(NEQUI, true) + "_" ) == string::npos ) return false;
 
   return true;
 }
@@ -180,12 +174,13 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-/* returns number of equilibration-steps left */
-int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
+/* returns number of equilibration-steps left with new read configuration 
+   or zero if no new configuration was read */
+void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes)
 {
-  int nequileft = NEQUI;
+  readnewconfig = false;
 
-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -195,12 +190,24 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
+      int iDidVirtualSkips;
 
-      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return nequileft;
+      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
+	if (readnewconfig)
+	  nequileft = nequileft_internal;
+	return;
+      }
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
 	openFileDesc = *inFileIt;
 
+	if (openFileDesc.nequi < NEQUI)
+	  doVirtualEquilibration = true;
+	else
+	  doVirtualEquilibration = false;
+
+	firstUsedConfig = true;
+
 	if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
 	inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
 	
@@ -215,15 +222,17 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
 
       if( inFile.is_open() ) 
 	{
-	  if (openFileDesc.doVirtualEquilibration) {
+	  if (doVirtualEquilibration) {
 	    if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;
-	    openFileDesc.doVirtualEquilibration = false;
-	    for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+	    doVirtualEquilibration = false;
+	    for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {
 	      if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
 		break;
-	      else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
+	      else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
 		memcpy(configMem, tmpConfig, configSize);
-		nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
+		nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
+		readnewconfig = true;
+		firstUsedConfig = false;
 	      }
 	    }
 	  }
@@ -231,7 +240,17 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
 	  if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
-	      return -1;
+	      readnewconfig = true;
+	      if (firstUsedConfig) {
+		firstUsedConfig = false;
+		if (openFileDesc.nequi < NEQUI)
+		  nequileft_internal = NEQUI - openFileDesc.nequi - iDidVirtualSkips*openFileDesc.nskip;
+		else
+		  nequileft_internal = NEQUI - openFileDesc.nequi;
+	      }
+	      nequileft_internal -= openFileDesc.nskip;
+	      nequileft = nequileft_internal;
+	      return;
 	    }
 	  else {
 	    if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
@@ -241,12 +260,12 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
     }
 }
 
-void configcache::openOutFile()
+void configcache::openOutFile(int actnequi)
 {
   time_t secstamp = time(NULL);
 
   outFileName.str("");
-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";
+  outFileName << DATADIR << "/" << secstamp << "_" << getFileId(actnequi) << "_.edat.tmp";
 
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
@@ -255,13 +274,13 @@ void configcache::openOutFile()
   outBuffer->push(outFile);
 }
 
-void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size) {
+void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {
   unsigned long headeridhash;
 
   if( DATADIR == "" || MODE < 2 ) return;
 
   if(!outFile.is_open())
-    openOutFile();
+    openOutFile(actnequi);
 
   headeridhash = hash(headerid);
 
@@ -270,14 +289,14 @@ void configcache::writeHeader(const string& headerid, const char *header, long u
   boost::iostreams::write(*outBuffer, header, size);
 }
 
-void configcache::writeConfig()
+void configcache::writeConfig(int actnequi)
 {
   long unsigned int zeroheader=0;
 
   if ( DATADIR == "" || MODE < 2 ) return;
 
   if ( ! outFile.is_open() )
-    openOutFile();
+    openOutFile(actnequi);
   
   boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));
 
@@ -304,6 +323,7 @@ void configcache::setPara(const string& parid, const double& value){
   inFiles.clear();
 
   refetchDataFiles = true;
+  nequileft_internal = NEQUI;
 }
 
 configcache::~configcache()