X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/836ca8cca791128595d9514b6d03a47dc32dd7a4..0e276c2770688b3cc7676ee84c8e35246621f6df:/configcache.cpp?ds=sidebyside

diff --git a/configcache.cpp b/configcache.cpp
index f00e187..7409b39 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -43,24 +43,28 @@ void configcache::fetchDataFiles()
 {
   struct dirent *de=NULL;
   DIR *d=NULL;
+  static infiledesc filedesc;
   
   d=opendir(DATADIR.c_str());
   if(d != NULL){
     while(de = readdir(d)){
       string filename = de->d_name;
-      if(isValidInFile(filename)) 
+      if(isValidInFile(filename, &filedesc)) 
 	{
-	  inFiles.push_back(filename);
+	  inFiles.push_back(filedesc);
 	}
     }
   }
 }
 
-bool configcache::isValidInFile(const string& infile)
+bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 {
   char *inchar, *inParts;
   string truncIn, truncOut;
 
+  filedesc->filename = infile;
+  filedesc->doVirtualEquilibration = false;
+
   if( infile.size() < 4 ) return false;
 
   if( infile.substr(infile.size()-3) != "dat" ) return false;
@@ -76,8 +80,18 @@ bool configcache::isValidInFile(const string& infile)
       switch(iPart)
 	{
 	case 1: if(inParts != CACHEID) return false; break;
-	case 2: if(atoi(inParts) != NEQUI) return false; break;
-	case 3: if(atoi(inParts) != NSKIP) return false; break;
+	case 2: 
+	  if (atoi(inParts) > NEQUI) 
+	    return false; 
+	  else if (atoi(inParts) < NEQUI)
+	    filedesc->doVirtualEquilibration = true;
+	  filedesc->nequi = atoi(inParts);
+	  break;
+	case 3: 
+	  if(atoi(inParts) != NSKIP) 
+	    return false;
+	  filedesc->nskip = atoi(inParts);
+	  break;
 	}
       inParts = strtok( NULL, "_");
     }
@@ -105,23 +119,14 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
 	{
-	  if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;
+	  if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
 
-	  inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
+	  openFileDesc = inFiles.back();
+	  inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
 	  inFiles.pop_back();
 
 	  if( !inFile.is_open() ) continue;
 
-	  std::streampos fsize = inFile.tellg();
-          inFile.seekg( 0, std::ios::end );
-          fsize = inFile.tellg() - fsize;
-	  if( (int)fsize == 0 ) {
-	    *out->log << "CCACHE: dat-file has zero length! Skipping." << endl << flush;
-	    inFile.close();
-	    continue;
-	  }
-	  inFile.seekg(0);
-
 	  inBuffer = new boost::iostreams::filtering_istreambuf;
 	  inBuffer->push( boost::iostreams::bzip2_decompressor() );
 	  inBuffer->push(inFile);
@@ -129,19 +134,24 @@ bool configcache::readConfig()
 
       if( inFile.is_open() ) 
 	{
-	  int readturn = -1;
-	  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
-	  catch (std::exception const& ex) {
-	    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
-	    inFile.close();
+	  if (openFileDesc.doVirtualEquilibration) {
+	    *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
+	    openFileDesc.doVirtualEquilibration = false;
+	    for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+	      if( readConfigToMem(tmpConfig) != configSize || ! inFile.is_open() )
+		break;
+	    }
 	  }
-	  
-	  if( readturn == configSize && inFile.is_open() )
+
+	  if( readConfigToMem(tmpConfig) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
 	      return true;
 	    }
-	  else inFile.close(); 
+	  else {
+	    *out->log << "CCACHE: Closing dat-file: " << openFileDesc.filename << endl << flush;
+	    inFile.close();
+	  }
 	}
     }
 }
@@ -208,3 +218,24 @@ void configcache::finishOutFile()
       rename( outFileName.str().c_str(), outFileName.str().substr(0, outFileName.str().size()-4).c_str() );
     }
 }
+
+int configcache::readConfigToMem(char *tmpConfig)
+{
+  int readturn = -1;
+
+  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+  catch(boost::iostreams::bzip2_error& error) { 
+    if(out) *out->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;
+    inFile.close();
+  }
+  catch( ... ) {
+    if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
+    inFile.close();
+  }
+
+  return readturn;
+}