X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/31dc8788f9711670917daaa5cc544d0d87ec3afc..46e492935d31a36641b8e8a5cd27bd86e7df96c4:/configcache.cpp?ds=inline

diff --git a/configcache.cpp b/configcache.cpp
index fe7bd78..35e8548 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; ipara<Paras.size(); ipara++)
     fileid << "_" << Paras[ipara].id << Paras[ipara].val;
 
@@ -68,6 +73,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   filedesc->filename = infile;
   filedesc->doVirtualEquilibration = false;
+  filedesc->firstConfig = true;
 
   if( infile.size() < 4 ) return false;
 
@@ -80,7 +86,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,11 +94,11 @@ 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)
+	case 1: if(inParts != CACHEID)
+	    return false;
+	  break;
+	case 2:
+	  if (atoi(inParts) < NEQUI)
 	    filedesc->doVirtualEquilibration = true;
 	  filedesc->nequi = atoi(inParts);
 	  break;
@@ -108,7 +114,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 +137,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 +178,13 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
-bool configcache::readConfig()
+/* 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<unsigned long> *excludeFileHashes)
 {
-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
+  readnewconfig = false;
+
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -183,15 +193,22 @@ bool configcache::readConfig()
 
   while(true)
     {
-      if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
+      vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
 
-      while( (!inFile.is_open()) && inFiles.size() > 0 ) {
-	if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
+	cout << "RETURNING..." << endl;
+	nequileft = nequileft_internal;
+	return;
+      }
 
-	openFileDesc = inFiles.back();
-	inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
-	inFiles.pop_back();
+      while( (!inFile.is_open()) && inFiles.size() > 0 ) {
+	openFileDesc = *inFileIt;
 
+	if(log) *log << "CCACHE: Opening dat-file: " << inFileIt->filename << endl << flush;
+	inFile.open( (DATADIR + "/" + inFileIt->filename).c_str(), std::ios::binary );
+	
+	inFiles.erase(inFileIt);
+	
 	if( !inFile.is_open() ) continue;
 
 	inBuffer = new boost::iostreams::filtering_istreambuf;
@@ -202,33 +219,48 @@ bool configcache::readConfig()
       if( inFile.is_open() ) 
 	{
 	  if (openFileDesc.doVirtualEquilibration) {
-	    if(out) *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
+	    if(log) *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;
+	      else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft_internal ) {
+		memcpy(configMem, tmpConfig, configSize);
+		nequileft_internal = NEQUI - openFileDesc.nequi - (iskip+1)*openFileDesc.nskip;
+		cout << "blabla:" << nequileft_internal << endl;
+		readnewconfig = true;
+	      }
 	    }
+	    openFileDesc.firstConfig = false;
 	  }
 
 	  if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
-	      return true;
+	      readnewconfig = true;
+	      if (openFileDesc.firstConfig) {
+		openFileDesc.firstConfig = false;
+		nequileft_internal = NEQUI - openFileDesc.nequi;
+	      }
+	      nequileft_internal -= openFileDesc.nskip;
+	      cout << "sadasd:" << nequileft_internal << endl;
+	      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 );
 
@@ -237,13 +269,13 @@ void configcache::openOutFile()
   outBuffer->push(outFile);
 }
 
-void configcache::writeHeader(const string& headerid, 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);
 
@@ -252,14 +284,14 @@ void configcache::writeHeader(const string& headerid, char *header, long unsigne
   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));
 
@@ -329,15 +361,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();
   }
 
@@ -361,3 +393,22 @@ void configcache::deleteHeaderStore()
     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) {
+      bool excludethisfile = false;
+
+      for (vector<unsigned long>::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit)
+	if ( *exit == hash(init->filename) ) {
+	  excludethisfile = true;
+	  break;
+	}
+
+      if (excludethisfile)
+	continue;
+    }
+    return init;
+  }
+  return inFiles.end();
+}