X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/7f5403eed95da4350dcc03d817eb8468dab07142..20acc11c8054200c02794f58e3cc63851b5627ff:/configcache.cpp diff --git a/configcache.cpp b/configcache.cpp index 1095775..0cabc9d 100644 --- a/configcache.cpp +++ b/configcache.cpp @@ -10,14 +10,19 @@ #define HEADER_READLAST 2 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode, - writeout *out_a){ - out = out_a; + ostream *_log){ + log = _log; NEQUI = nequi; NSKIP = nskip; DATADIR = datadir; CACHEID = cacheid; + if ( cacheid.find("_") != -1 ) { + if(log) *log << "CCACHE: Invalid cacheid \"" << cacheid << "\" given. Cacheids must not contain underscores!" << endl << flush; + exit(1); + } + configMem = (char*)malloc(configMemSize); tmpConfig = (char*)malloc(configMemSize); @@ -32,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; iparafilename = infile; - filedesc->doVirtualEquilibration = false; if( infile.size() < 4 ) return false; @@ -80,7 +84,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc) inchar = new char [infile.size()+1]; strcpy (inchar, infile.c_str()); - + inParts = strtok( inchar, "_" ); for(int iPart=0; inParts!=NULL; iPart++) { @@ -88,12 +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: @@ -108,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; } @@ -131,19 +133,19 @@ int configcache::readHeader() return HEADER_READOK; } else { - if(out) *out->log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush; + if(log) *log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush; inFile.close(); return HEADER_READERR; } } else { - if(out) *out->log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush; + if(log) *log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush; inFile.close(); return HEADER_READERR; } } else { - if(out) *out->log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush; + if(log) *log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush; inFile.close(); return HEADER_READERR; } @@ -172,9 +174,13 @@ void * configcache::getHeader(const string& headerid) { return NULL; } -bool configcache::readConfig(vector *excludeFileHashes) -{ - if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false; +/* 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 *excludeFileHashes) +{ + readnewconfig = false; + + if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return; if(refetchDataFiles){ refetchDataFiles = false; @@ -183,28 +189,29 @@ bool configcache::readConfig(vector *excludeFileHashes) while(true) { - if( (!inFile.is_open()) && inFiles.size() == 0 ) return false; + vector::iterator inFileIt = getNextInfile(excludeFileHashes); + int iDidVirtualSkips; - while( (!inFile.is_open()) && inFiles.size() > 0 ) { - bool excludethisfile=false; + if( (!inFile.is_open()) && inFileIt == inFiles.end() ) { + if (readnewconfig) + nequileft = nequileft_internal; + return; + } - openFileDesc = inFiles.back(); + while( (!inFile.is_open()) && inFiles.size() > 0 ) { + openFileDesc = *inFileIt; - if (excludeFileHashes != NULL) - for (vector::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit) - if ( *exit == hash(inFiles.back().filename) ) { - excludethisfile = true; - break; - } - - if ( ! excludethisfile ) { - if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush; - inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary ); - } + if (openFileDesc.nequi < NEQUI) + doVirtualEquilibration = true; else - if(out) *out->log << "CCACHE: Excluded dat-file: " << inFiles.back().filename << endl << flush; + 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 ); - inFiles.pop_back(); + inFiles.erase(inFileIt); if( !inFile.is_open() ) continue; @@ -215,34 +222,50 @@ bool configcache::readConfig(vector *excludeFileHashes) if( inFile.is_open() ) { - 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 (doVirtualEquilibration) { + if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush; + 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) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) { + memcpy(configMem, tmpConfig, configSize); + nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip; + readnewconfig = true; + firstUsedConfig = false; + } } } if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() ) { memcpy(configMem, tmpConfig, configSize); - return true; + 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(out) *out->log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush; + if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush; inFile.close(); } } } } -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 ); @@ -251,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); @@ -266,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)); @@ -300,6 +323,7 @@ void configcache::setPara(const string& parid, const double& value){ inFiles.clear(); refetchDataFiles = true; + nequileft_internal = NEQUI; } configcache::~configcache() @@ -343,15 +367,15 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize) 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; + if(log) *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; + if(log) *log << "CCACHE: Caught exception: " << ex.what() << endl << flush; inFile.close(); } catch( ... ) { - if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush; + if(log) *log << "CCACHE: Caught unknown exception while reading." << endl << flush; inFile.close(); } @@ -375,3 +399,22 @@ void configcache::deleteHeaderStore() headerStore.pop_back(); } } + +vector::iterator configcache::getNextInfile(vector *excludeFileHashes) { + for (vector::iterator init = inFiles.begin(); init != inFiles.end(); ++init) { + if (excludeFileHashes != NULL) { + bool excludethisfile = false; + + for (vector::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit) + if ( *exit == hash(init->filename) ) { + excludethisfile = true; + break; + } + + if (excludethisfile) + continue; + } + return init; + } + return inFiles.end(); +}