X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/238fccf7dd50a69b5825f4544b3e247bfbf4e417..1a6e4ad36f2b712a042007efb5184e2f34958595:/configcache.cpp?ds=inline diff --git a/configcache.cpp b/configcache.cpp index 02b6d94..c6f9082 100644 --- a/configcache.cpp +++ b/configcache.cpp @@ -5,10 +5,22 @@ #include #include +#include +#include +#include +#include +#include + #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,19 +41,20 @@ 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; 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; iparafilename = infile; - filedesc->doVirtualEquilibration = false; if( infile.size() < 4 ) return false; @@ -97,10 +109,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc) 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: @@ -115,7 +123,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; } @@ -179,12 +187,11 @@ void * configcache::getHeader(const string& headerid) { return NULL; } -/* returns number of equilibration-steps left */ -int configcache::readConfig(vector *excludeFileHashes) +void configcache::readConfig(bool *readnewconfig, int *nequileft, vector *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; @@ -194,12 +201,24 @@ int configcache::readConfig(vector *excludeFileHashes) while(true) { vector::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 ); @@ -207,22 +226,24 @@ int configcache::readConfig(vector *excludeFileHashes) 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; + nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip; + *readnewconfig = true; + firstUsedConfig = false; } } } @@ -230,7 +251,17 @@ int configcache::readConfig(vector *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; @@ -240,47 +271,47 @@ int configcache::readConfig(vector *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 ); - 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) { +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); - 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() +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)); + 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){ @@ -297,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() ) @@ -344,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();