added virtual equilibration.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 1c4aa05544a79541669e59b980fd0a46bc325ecc..7409b39d433be5262c48c29bdfe75bd587b7c5e0 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -4,9 +4,11 @@
 #include <iostream>
 #include <time.h>
 #include <dirent.h>
 #include <iostream>
 #include <time.h>
 #include <dirent.h>

-#include <string.h>

 
 

-configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize){
+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;
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;


@@ -21,6 +23,8 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   outBuffer = NULL;
   inBuffer = NULL;
 
   outBuffer = NULL;
   inBuffer = NULL;
 

+  MODE = cachemode;
+

   refetchDataFiles = false;
 }
 
   refetchDataFiles = false;
 }
 


@@ -39,24 +43,28 @@ void configcache::fetchDataFiles()
 {
   struct dirent *de=NULL;
   DIR *d=NULL;
 {
   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;
   
   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;
 
 {
   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.size() < 4 ) return false;
 
   if( infile.substr(infile.size()-3) != "dat" ) return false;


@@ -72,8 +80,18 @@ bool configcache::isValidInFile(const string& infile)
       switch(iPart)
        {
        case 1: if(inParts != CACHEID) return false; break;
       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, "_");
     }
        }
       inParts = strtok( NULL, "_");
     }


@@ -81,14 +99,14 @@ bool configcache::isValidInFile(const string& infile)
 
   delete[] inchar;
 
 
   delete[] inchar;
 

-  if( truncIn.find( getFileId(true) ) == string::npos ) return false;
+  if( truncIn.find( getFileId(true) + "_" ) == string::npos ) return false;

 
   return true;
 }
 
 bool configcache::readConfig()
 {
 
   return true;
 }
 
 bool configcache::readConfig()
 {

-  if(DATADIR == "") return false;
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;

 
   if(refetchDataFiles){
     refetchDataFiles = false;
 
   if(refetchDataFiles){
     refetchDataFiles = false;


@@ -101,7 +119,10 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {

-         inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
+         if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+
+         openFileDesc = inFiles.back();
+         inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );

          inFiles.pop_back();
 
          if( !inFile.is_open() ) continue;
          inFiles.pop_back();
 
          if( !inFile.is_open() ) continue;


@@ -113,25 +134,37 @@ bool configcache::readConfig()
 
       if( inFile.is_open() ) 
        {
 
       if( inFile.is_open() ) 
        {

-         if( boost::iostreams::read(*inBuffer, tmpConfig, configSize) == configSize )
+         if (openFileDesc.doVirtualEquilibration) {
+           *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
+           openFileDesc.doVirtualEquilibration = false;
+           for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
+             if( readConfigToMem(tmpConfig) != configSize || ! inFile.is_open() )
+               break;
+           }
+         }
+
+         if( readConfigToMem(tmpConfig) == configSize && inFile.is_open() )

            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }
            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }

-         else inFile.close();
+         else {
+           *out->log << "CCACHE: Closing dat-file: " << openFileDesc.filename << endl << flush;
+           inFile.close();
+         }

        }
     }
 }
 
 void configcache::writeConfig()
 {
        }
     }
 }
 
 void configcache::writeConfig()
 {

-  if( DATADIR == "") return;
+  if( DATADIR == "" || MODE < 2 ) return;

 
   if(!outFile.is_open()){
     time_t secstamp = time(NULL);
 
     outFileName.str("");
 
   if(!outFile.is_open()){
     time_t secstamp = time(NULL);
 
     outFileName.str("");

-    outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << ".dat.tmp";    
+    outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.dat.tmp";    

     outFile.open( outFileName.str().c_str(), std::ios::binary );
 
     outBuffer = new boost::iostreams::filtering_ostreambuf;
     outFile.open( outFileName.str().c_str(), std::ios::binary );
 
     outBuffer = new boost::iostreams::filtering_ostreambuf;


@@ -185,3 +218,24 @@ void configcache::finishOutFile()
       rename( outFileName.str().c_str(), outFileName.str().substr(0, outFileName.str().size()-4).c_str() );
     }
 }
       rename( outFileName.str().c_str(), outFileName.str().substr(0, outFileName.str().size()-4).c_str() );
     }
 }

+
+int configcache::readConfigToMem(char *tmpConfig)
+{
+  int readturn = -1;
+
+  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+  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;
+}