X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/027b93b16fe0d77104e0e711377c5728b0934035..a55a5830c5c98e950d58593697dd4ee5e4384716:/configcache.cpp diff --git a/configcache.cpp b/configcache.cpp index f3c02de..fcfdd8e 100644 --- a/configcache.cpp +++ b/configcache.cpp @@ -5,7 +5,10 @@ #include #include -configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode){ +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; + NEQUI = nequi; NSKIP = nskip; DATADIR = datadir; @@ -23,6 +26,8 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk MODE = cachemode; refetchDataFiles = false; + + readHeaderData = NULL; } string configcache::getFileId(const bool& shortid) @@ -40,27 +45,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()); @@ -73,8 +87,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, "_"); } @@ -87,6 +111,36 @@ bool configcache::isValidInFile(const string& infile) return true; } +bool configcache::readHeader() +{ + long unsigned int headersize; + + if( readDataToMem((char*)&headersize, sizeof(long unsigned int)) == sizeof(long unsigned int) && inFile.is_open() ) + { + if( readHeaderData != NULL ) free(readHeaderData); + + readHeaderData = (char*) malloc(headersize); + + if( readDataToMem(readHeaderData, headersize) == headersize && inFile.is_open() ) { + return true; + } + else { + if(out) *out->log << "CCACHE: Could not read header! Closing dat-file: " << openFileDesc.filename << endl << flush; + inFile.close(); + return false; + } + } + else { + if(out) *out->log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush; + inFile.close(); + return false; + } +} + +void *configcache::getHeader() { + return readHeaderData; +} + bool configcache::readConfig() { if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false; @@ -100,47 +154,85 @@ bool configcache::readConfig() { if( (!inFile.is_open()) && inFiles.size() == 0 ) return false; - while( (!inFile.is_open()) && inFiles.size() > 0 ) - { - inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary ); - inFiles.pop_back(); + while( (!inFile.is_open()) && inFiles.size() > 0 ) { + if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush; - if( !inFile.is_open() ) continue; + openFileDesc = inFiles.back(); + inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary ); + inFiles.pop_back(); - inBuffer = new boost::iostreams::filtering_istreambuf; - inBuffer->push( boost::iostreams::bzip2_decompressor() ); - inBuffer->push(inFile); - } + if( !inFile.is_open() ) continue; + + inBuffer = new boost::iostreams::filtering_istreambuf; + inBuffer->push( boost::iostreams::bzip2_decompressor() ); + inBuffer->push(inFile); + } if( inFile.is_open() ) { - if( boost::iostreams::read(*inBuffer, tmpConfig, configSize) == configSize ) + 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( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() ) + break; + } + } + + if( readFullBlock(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); + + headerWritten = false; +} + +void configcache::writeHeader(char *header, long unsigned 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, (char*)&size, sizeof(long unsigned int)); + boost::iostreams::write(*outBuffer, header, size); + + headerWritten = true; +} - 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() ) + openOutFile(); + + if ( ! headerWritten ) { + long unsigned int zeroheader=0; + boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int)); } boost::iostreams::write(*outBuffer, configMem, configSize); + headerWritten = false; } void configcache::addPara(const string& parid, const double& val){ @@ -186,3 +278,37 @@ void configcache::finishOutFile() rename( outFileName.str().c_str(), outFileName.str().substr(0, outFileName.str().size()-4).c_str() ); } } + +int configcache::readFullBlock(char *tmpData, long unsigned int dataSize) +{ + /* try to read header */ + if ( openFileDesc.extended ) + if ( ! readHeader() ) + return -1; + + /* read data */ + return readDataToMem(tmpData, dataSize); +} + +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; +}