X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/974356cea3f71fcefd5a970cb6441e158e39b3ed..3bb55613d615dd93b662c4cd1a9c6198f7de53ff:/configcache.cpp?ds=inline

diff --git a/configcache.cpp b/configcache.cpp
index af0a206..1b22757 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -43,27 +43,36 @@ 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;
+  if( infile.substr(infile.size()-4) == ".dat" )
+    filedesc->extended = false;
+  else if( infile.substr(infile.size()-4) == "edat" )
+    filedesc->extended = true;
+  else
+    return false;
 
   inchar = new char [infile.size()+1];
   strcpy (inchar, infile.c_str());
@@ -76,8 +85,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, "_");
     }
@@ -90,6 +109,55 @@ bool configcache::isValidInFile(const string& infile)
   return true;
 }
 
+bool configcache::openInFile() {
+  while( (!inFile.is_open()) && inFiles.size() > 0 )
+    {
+      if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+
+      openFileDesc = inFiles.back();
+      inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
+      inFiles.pop_back();
+
+      if( !inFile.is_open() ) continue;
+
+      inBuffer = new boost::iostreams::filtering_istreambuf;
+      inBuffer->push( boost::iostreams::bzip2_decompressor() );
+      inBuffer->push(inFile);
+
+      return true;
+    }
+
+  return false;
+}
+
+void configcache::readHeader()
+{
+  int headersize;
+  
+  if( readDataToMem((char*)&headersize, sizeof(int)) == sizeof(int) && inFile.is_open() )
+    {
+      if( headerData != NULL ) delete headerData;
+
+      headerData = new char(headersize);
+      
+      if( readDataToMem(headerData, headersize) == headersize && inFile.is_open() ) {
+	if(out) *out->log << "CCACHE: Read header information." << endl << flush;
+      }
+      else {
+	if(out) *out->log << "CCACHE: Could not read header! Closing dat-file: " << openFileDesc.filename << endl << flush;
+	inFile.close();
+      }
+    }
+  else {
+    if(out) *out->log << "CCACHE: Could not read header size! Closing dat-file: " << openFileDesc.filename << endl << flush;
+    inFile.close();
+  }
+}
+
+void *configcache::getHeader() {
+  return headerData;
+}
+
 bool configcache::readConfig()
 {
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
@@ -103,63 +171,66 @@ bool configcache::readConfig()
     {
       if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
 
-      while( (!inFile.is_open()) && inFiles.size() > 0 )
-	{
-	  if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;
-
-	  inFile.open( (DATADIR + "/" + inFiles.back()).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( 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);
-	}
+      /* read header information */
+      if ( openInFile() && openFileDesc.extended )
+	readHeader();
 
       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) {
+	    if(out) *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
+	    openFileDesc.doVirtualEquilibration = false;
+	    for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+	      if( readDataToMem(tmpConfig, configSize) != configSize || ! inFile.is_open() )
+		break;
+	    }
 	  }
-	  
-	  if( readturn == configSize && inFile.is_open() )
+
+	  if( readDataToMem(tmpConfig, configSize) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
 	      return true;
 	    }
-	  else inFile.close(); 
+	  else {
+	    if(out) *out->log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
+	    inFile.close();
+	  }
 	}
     }
 }
 
-void configcache::writeConfig()
+void configcache::openOutFile()
 {
+  time_t secstamp = time(NULL);
+
+  outFileName.str("");
+  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";    
+  outFile.open( outFileName.str().c_str(), std::ios::binary );
+
+  outBuffer = new boost::iostreams::filtering_ostreambuf;
+  outBuffer->push(boost::iostreams::bzip2_compressor());
+  outBuffer->push(outFile);
+}
+
+void configcache::writeHeader(char *header, const int& size) {
   if( DATADIR == "" || MODE < 2 ) return;
 
-  if(!outFile.is_open()){
-    time_t secstamp = time(NULL);
+  if(!outFile.is_open()) {
+    openOutFile();
+    boost::iostreams::write(*outBuffer, header, size);
+  }
+  else
+    if(out) *out->log << "CCACHE: Not writing header because outfile is already open!" << endl << flush;
+}
 
-    outFileName.str("");
-    outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.dat.tmp";    
-    outFile.open( outFileName.str().c_str(), std::ios::binary );
+void configcache::writeConfig()
+{
+  if( DATADIR == "" || MODE < 2 ) return;
 
-    outBuffer = new boost::iostreams::filtering_ostreambuf;
-    outBuffer->push(boost::iostreams::bzip2_compressor());
-    outBuffer->push(outFile);
+  if(!outFile.is_open()){
+    int zeroheader=0;
+    openOutFile();
+    boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(int));
   }
 
   boost::iostreams::write(*outBuffer, configMem, configSize);
@@ -208,3 +279,26 @@ void configcache::finishOutFile()
       rename( outFileName.str().c_str(), outFileName.str().substr(0, outFileName.str().size()-4).c_str() );
     }
 }
+
+int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
+{
+  int readturn = -1;
+
+  if ( dataSize == 0 ) return 0;
+
+  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;
+    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;
+}