X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/36bc55ceb7b62569c7604f28b3e53bc2e42cf0ce..dddf9581bc6442e82a1a9fb626f6c04c9ca7d07a:/configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 168de5e..c6f9082 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,10 +5,22 @@
 #include <time.h>
 #include <dirent.h>
 
+#include <boost/iostreams/filtering_streambuf.hpp>
+#include <boost/iostreams/stream.hpp>
+#include <boost/iostreams/filter/bzip2.hpp>
+#include <boost/iostreams/device/array.hpp>
+#include <boost/iostreams/copy.hpp>
+
 #define HEADER_READOK   0
 #define HEADER_READERR  1
 #define HEADER_READLAST 2
 
+struct configcache::iobuffers
+{
+  boost::iostreams::filtering_istreambuf *in;
+  boost::iostreams::filtering_ostreambuf *out;
+};
+
 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
 			 ostream *_log){
   log = _log;
@@ -29,8 +41,9 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   *configmem = configMem;
   configSize = configMemSize;
 
-  outBuffer = NULL;
-  inBuffer = NULL;
+  ioBuffers = new iobuffers;
+  ioBuffers->in = NULL;
+  ioBuffers->out = NULL;
 
   MODE = cachemode;
 
@@ -72,8 +85,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   string truncIn, truncOut;
 
   filedesc->filename = infile;
-  filedesc->doVirtualEquilibration = false;
-  filedesc->readEquilibratedConfigs = 0;
 
   if( infile.size() < 4 ) return false;
 
@@ -98,8 +109,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 	    return false;
 	  break;
 	case 2:
-	  if (atoi(inParts) < NEQUI)
-	    filedesc->doVirtualEquilibration = true;
 	  filedesc->nequi = atoi(inParts);
 	  break;
 	case 3: 
@@ -178,12 +187,9 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-/* 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)
+void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes)
 {
-  readnewconfig = false;
-  nequileft = NEQUI;
+  *readnewconfig = false;
 
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
@@ -195,12 +201,24 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
+      int iDidVirtualSkips;
 
-      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return;
+      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 );
 	
@@ -208,23 +226,24 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 	
 	if( !inFile.is_open() ) continue;
 
-	inBuffer = new boost::iostreams::filtering_istreambuf;
-	inBuffer->push( boost::iostreams::bzip2_decompressor() );
-	inBuffer->push(inFile);
+	ioBuffers->in = new boost::iostreams::filtering_istreambuf;
+	ioBuffers->in->push( boost::iostreams::bzip2_decompressor() );
+	ioBuffers->in->push(inFile);
       }
 
       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;
-		readnewconfig = true;
+		nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
+		*readnewconfig = true;
+		firstUsedConfig = false;
 	      }
 	    }
 	  }
@@ -232,9 +251,16 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 	  if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
-	      readnewconfig = true;
-	      nequileft = NEQUI - openFileDesc.nequi - openFileDesc.readEquilibratedConfigs*openFileDesc.nskip;
-	      openFileDesc.readEquilibratedConfigs++;
+	      *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 {
@@ -246,7 +272,7 @@ void configcache::readConfig(bool& readnewconfig, int& nequileft, vector<unsigne
 }
 
 void configcache::openOutFile(int actnequi)
-{
+{ 
   time_t secstamp = time(NULL);
 
   outFileName.str("");
@@ -254,9 +280,9 @@ void configcache::openOutFile(int actnequi)
 
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
-  outBuffer = new boost::iostreams::filtering_ostreambuf;
-  outBuffer->push(boost::iostreams::bzip2_compressor());
-  outBuffer->push(outFile);
+  ioBuffers->out = new boost::iostreams::filtering_ostreambuf;
+  ioBuffers->out->push(boost::iostreams::bzip2_compressor());
+  ioBuffers->out->push(outFile);
 }
 
 void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {
@@ -269,9 +295,9 @@ void configcache::writeHeader(const string& headerid, const char *header, long u
 
   headeridhash = hash(headerid);
 
-  boost::iostreams::write(*outBuffer, (char*)&size, sizeof(long unsigned int));
-  boost::iostreams::write(*outBuffer, (char*)&headeridhash, sizeof(unsigned long));
-  boost::iostreams::write(*outBuffer, header, size);
+  boost::iostreams::write(*ioBuffers->out, (char*)&size, sizeof(long unsigned int));
+  boost::iostreams::write(*ioBuffers->out, (char*)&headeridhash, sizeof(unsigned long));
+  boost::iostreams::write(*ioBuffers->out, header, size);
 }
 
 void configcache::writeConfig(int actnequi)
@@ -283,9 +309,9 @@ void configcache::writeConfig(int actnequi)
   if ( ! outFile.is_open() )
     openOutFile(actnequi);
   
-  boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));
+  boost::iostreams::write(*ioBuffers->out, (char*)&zeroheader, sizeof(long unsigned int));
 
-  boost::iostreams::write(*outBuffer, configMem, configSize);
+  boost::iostreams::write(*ioBuffers->out, configMem, configSize);
 }
 
 void configcache::addPara(const string& parid, const double& val){
@@ -302,27 +328,29 @@ int configcache::getParIndex(const string& parid){
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
+
   finishOutFile();
-  if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
+  if(ioBuffers->in != NULL) { delete ioBuffers->in; ioBuffers->in=NULL; } 
   inFile.close();
   inFiles.clear();
 
   refetchDataFiles = true;
+  nequileft_internal = NEQUI;
 }
 
 configcache::~configcache()
 {
   finishOutFile();
-  delete inBuffer;
-  inBuffer = NULL;
+  delete ioBuffers->in;
+  ioBuffers->in = NULL;
 }
 
 void configcache::finishOutFile()
 {
-  if( outBuffer != NULL )
+  if( ioBuffers->out != NULL )
     {
-      delete outBuffer;
-      outBuffer = NULL;
+      delete ioBuffers->out;
+      ioBuffers->out = NULL;
     }
 
   if( outFile.is_open() )
@@ -349,7 +377,7 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
 
   if ( dataSize == 0 ) return 0;
 
-  try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
+  try { readturn = boost::iostreams::read(*ioBuffers->in, tmpData, dataSize); }
   catch(boost::iostreams::bzip2_error& error) { 
     if(log) *log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
     inFile.close();