struct configcache::iobuffers
{
- boost::iostreams::filtering_istreambuf *in;
boost::iostreams::filtering_ostreambuf *out;
};
ostream *_log){
log = _log;
+ dataReader = new datread(configMemSize, log);
+
NEQUI = nequi;
NSKIP = nskip;
DATADIR = datadir;
configSize = configMemSize;
ioBuffers = new iobuffers;
- ioBuffers->in = NULL;
ioBuffers->out = NULL;
MODE = cachemode;
if( superextended )
fileid << "_" << hash( paraString() );
else
- fileid << "_" << paraString();
+ fileid << paraString();
return fileid.str();
}
return true;
}
-int configcache::readHeader()
-{
- long unsigned int headersize;
-
- if( readDataToMem((char *)&headersize, sizeof(long unsigned int)) == sizeof(long unsigned int) && inFile.is_open() ) {
- if ( headersize == 0 )
- return HEADER_READLAST;
-
- pair<unsigned long, void *> newHeader;
-
- if( readDataToMem((char *)&newHeader.first, sizeof(unsigned long)) == sizeof(unsigned long) && inFile.is_open() ) {
- newHeader.second = malloc(headersize);
-
- if( readDataToMem((char *)newHeader.second, headersize) == headersize && inFile.is_open() ) {
- headerStore.push_back(newHeader);
- return HEADER_READOK;
- }
- else {
- if(log) *log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush;
- inFile.close();
- return HEADER_READERR;
- }
- }
- else {
- if(log) *log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush;
- inFile.close();
- return HEADER_READERR;
- }
- }
- else {
- if(log) *log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush;
- inFile.close();
- return HEADER_READERR;
- }
-}
-
-bool configcache::readAllHeaders()
-{
- int readHeaderStatus;
-
- deleteHeaderStore();
-
- do {
- readHeaderStatus = readHeader();
- }
- while ( readHeaderStatus == HEADER_READOK );
-
- if ( readHeaderStatus == HEADER_READLAST ) return true;
- else if ( readHeaderStatus == HEADER_READERR ) return false;
-}
-
void * configcache::getHeader(const string& headerid) {
- for (vector< pair<unsigned long, void *> >::iterator headerStoreIt = headerStore.begin(); headerStoreIt != headerStore.end(); ++headerStoreIt)
- if ( headerStoreIt->first == hash(headerid) )
- return headerStoreIt->second;
-
- return NULL;
+ return dataReader->getHeader(headerid);
}
void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes)
vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
int iDidVirtualSkips;
- if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
+ if( (!dataReader->fisopen()) && inFileIt == inFiles.end() ) {
if (*readnewconfig)
*nequileft = nequileft_internal;
return;
}
- while( (!inFile.is_open()) && inFiles.size() > 0 ) {
+ while( (!dataReader->fisopen()) && inFiles.size() > 0 ) {
string inFileParaString;
openFileDesc = *inFileIt;
firstUsedConfig = true;
if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
- inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
-
+
+ dataReader->openFile( DATADIR + "/" + inFileIt->filename );
+
if( openFileDesc.superextended ) {
- getline( inFile, inFileParaString );
- if( inFileParaString != paraString() ) {
+ if( dataReader->getParaString() != paraString() ) {
if(log) *log << "CCACHE: Parastring does not match. Closing dat-file..." << endl << flush;
- inFile.close();
+ dataReader->closeFile();
}
}
-
+
inFiles.erase(inFileIt);
- if( !inFile.is_open() ) continue;
-
- ioBuffers->in = new boost::iostreams::filtering_istreambuf;
- ioBuffers->in->push( boost::iostreams::bzip2_decompressor() );
- ioBuffers->in->push(inFile);
+ if( !dataReader->fisopen() ) continue;
}
- if( inFile.is_open() )
+ if( dataReader->fisopen() )
{
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() )
+ if( dataReader->readFullBlock(tmpConfig) < 0 )
break;
else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {
memcpy(configMem, tmpConfig, configSize);
}
}
- if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
+ if( dataReader->readFullBlock(tmpConfig) >= 0 )
{
memcpy(configMem, tmpConfig, configSize);
*readnewconfig = true;
*nequileft = nequileft_internal;
return;
}
- else {
- if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
- inFile.close();
- }
}
}
}
Paras[getParIndex(parid)].val = value;
finishOutFile();
- if(ioBuffers->in != NULL) { delete ioBuffers->in; ioBuffers->in=NULL; }
- inFile.close();
+ dataReader->closeFile();
inFiles.clear();
refetchDataFiles = true;
configcache::~configcache()
{
finishOutFile();
- delete ioBuffers->in;
- ioBuffers->in = NULL;
+ delete dataReader;
}
void configcache::finishOutFile()
}
}
-int configcache::readFullBlock(char *tmpData, long unsigned int dataSize)
-{
- /* try to read header */
- if ( openFileDesc.extended )
- if ( ! readAllHeaders() )
- 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(*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();
- }
- catch (std::exception const& ex) {
- if(log) *log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
- inFile.close();
- }
- catch( ... ) {
- if(log) *log << "CCACHE: Caught unknown exception while reading." << endl << flush;
- inFile.close();
- }
-
- return readturn;
-}
-
unsigned long configcache::hash(const string& str)
{
unsigned long hash = 5381;
return hash;
}
-void configcache::deleteHeaderStore()
-{
- while ( headerStore.size() > 0 ) {
- free(headerStore.back().second);
- headerStore.pop_back();
- }
-}
-
vector<infiledesc>::iterator configcache::getNextInfile(vector<unsigned long> *excludeFileHashes) {
for (vector<infiledesc>::iterator init = inFiles.begin(); init != inFiles.end(); ++init) {
if (excludeFileHashes != NULL) {
projects / phys / latlib.git / blobdiff