X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/d945435d46acac2f758c23f0a5ae99cbb9894b91..b13049b02df74e31a311cf41eb0c61f1898ce77e:/configcache.cpp?ds=inline

diff --git a/configcache.cpp b/configcache.cpp
index 5987789..8687123 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -20,7 +20,6 @@
 
 struct configcache::iobuffers
 {
-  boost::iostreams::filtering_istreambuf *in;
   boost::iostreams::filtering_ostreambuf *out;
 };
 
@@ -28,6 +27,8 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
 			 ostream *_log){
   log = _log;
 
+  dataReader = new datread(configMemSize, log);
+  
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;
@@ -45,7 +46,6 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   configSize = configMemSize;
 
   ioBuffers = new iobuffers;
-  ioBuffers->in = NULL;
   ioBuffers->out = NULL;
 
   MODE = cachemode;
@@ -53,13 +53,25 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   refetchDataFiles = false;
 }
 
-string configcache::getFileId(int actnequi, const bool& shortid)
+string configcache::paraString() {
+  stringstream parastring;
+
+  for(int ipara=0; ipara<Paras.size(); ipara++)
+    parastring << "_" << Paras[ipara].id << Paras[ipara].val;
+  
+  return parastring.str();
+}
+
+string configcache::getFileId(int actnequi, const bool& superextended, const bool& shortid)
 {
   stringstream fileid;
 
   if(!shortid) fileid << CACHEID << "_" << actnequi << "_" << NSKIP;
-  for(int ipara=0; ipara<Paras.size(); ipara++)
-    fileid << "_" << Paras[ipara].id << Paras[ipara].val;
+
+  if( superextended )
+    fileid << "_" << hash( paraString() );
+  else
+    fileid << paraString();
 
   return fileid.str();
 }
@@ -91,10 +103,18 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   if( infile.size() < 4 ) return false;
 
-  if( infile.substr(infile.size()-4) == ".dat" )
+  if( infile.substr(infile.size()-4) == ".dat" ) {
     filedesc->extended = false;
-  else if( infile.substr(infile.size()-4) == "edat" )
+    filedesc->superextended = false;
+  }
+  else if( infile.substr(infile.size()-4) == "edat" ) {
+    filedesc->extended = true;
+    filedesc->superextended = false;
+  }
+  else if( infile.substr(infile.size()-4) == "sdat" ) {
     filedesc->extended = true;
+    filedesc->superextended = true;
+  }
   else
     return false;
 
@@ -126,68 +146,13 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   delete[] inchar;
 
-  if( truncIn.find( getFileId(NEQUI, true) + "_" ) == string::npos ) return false;
+  if( truncIn.find( getFileId(NEQUI, filedesc->superextended, true) + "_" ) == string::npos ) return false;
 
   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)
@@ -206,13 +171,15 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
       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;
 
 	if (openFileDesc.nequi < NEQUI)
@@ -223,24 +190,28 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 	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 ) {
+	  if( dataReader->getParaString() != paraString() ) {
+	    if(log) *log << "CCACHE: Parastring does not match. Closing dat-file..." << endl << flush;
+	    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);
@@ -251,7 +222,7 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 	    }
 	  }
 
-	  if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
+	  if( dataReader->readFullBlock(tmpConfig) >= 0 )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
 	      *readnewconfig = true;
@@ -266,10 +237,6 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 	      *nequileft = nequileft_internal;
 	      return;
 	    }
-	  else {
-	    if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
-	    inFile.close();
-	  }
 	}
     }
 }
@@ -281,7 +248,7 @@ void configcache::openOutFile(int actnequi)
   
   while (true) {
     outFileName.str("");
-    outFileName << DATADIR << "/" << secstamp << "." << iseq << "_" << getFileId(actnequi) << "_.edat.tmp";
+    outFileName << DATADIR << "/" << secstamp << "." << iseq << "_" << getFileId(actnequi, true, false) << "_.sdat.tmp";
 
     int tmpfd = open(outFileName.str().c_str(), O_CREAT | O_EXCL, 0644);
 
@@ -299,6 +266,8 @@ void configcache::openOutFile(int actnequi)
   
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
+  outFile << paraString() << endl;
+
   ioBuffers->out = new boost::iostreams::filtering_ostreambuf;
   ioBuffers->out->push(boost::iostreams::bzip2_compressor());
   ioBuffers->out->push(outFile);
@@ -349,8 +318,7 @@ void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
 
   finishOutFile();
-  if(ioBuffers->in != NULL) { delete ioBuffers->in; ioBuffers->in=NULL; } 
-  inFile.close();
+  dataReader->closeFile();
   inFiles.clear();
 
   refetchDataFiles = true;
@@ -360,8 +328,7 @@ void configcache::setPara(const string& parid, const double& value){
 configcache::~configcache()
 {
   finishOutFile();
-  delete ioBuffers->in;
-  ioBuffers->in = NULL;
+  delete dataReader;
 }
 
 void configcache::finishOutFile()
@@ -379,40 +346,6 @@ 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;
@@ -423,14 +356,6 @@ unsigned long configcache::hash(const string& str)
   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) {