Using hashed parameter strings in cachefilenames.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 02b6d94ec3521578d196f23f0b63cefb4c8fa874..bdc593e3c53131ff78e3a869707a7b3c8886c7e7 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -4,11 +4,26 @@
 #include <iostream>
 #include <time.h>
 #include <dirent.h>
 #include <iostream>
 #include <time.h>
 #include <dirent.h>

+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <boost/iostreams/filtering_streambuf.hpp>
+#include <boost/iostreams/stream.hpp>
+#include <boost/iostreams/filter/bzip2.hpp>
+#include <boost/iostreams/device/array.hpp>
+#include <boost/iostreams/copy.hpp>

 
 #define HEADER_READOK   0
 #define HEADER_READERR  1
 #define HEADER_READLAST 2
 
 
 #define HEADER_READOK   0
 #define HEADER_READERR  1
 #define HEADER_READLAST 2
 

+struct configcache::iobuffers
+{
+  boost::iostreams::filtering_istreambuf *in;
+  boost::iostreams::filtering_ostreambuf *out;
+};
+

 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
                         ostream *_log){
   log = _log;
 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
                         ostream *_log){
   log = _log;


@@ -29,21 +44,31 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   *configmem = configMem;
   configSize = configMemSize;
 
   *configmem = configMem;
   configSize = configMemSize;
 

-  outBuffer = NULL;
-  inBuffer = NULL;
+  ioBuffers = new iobuffers;
+  ioBuffers->in = NULL;
+  ioBuffers->out = NULL;

 
   MODE = cachemode;
 
   refetchDataFiles = false;
 }
 
 
   MODE = cachemode;
 
   refetchDataFiles = false;
 }
 

-string configcache::getFileId(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& shortid)

 {
   stringstream fileid;
 
 {
   stringstream fileid;
 

-  if(!shortid) fileid << CACHEID << "_" << NEQUI << "_" << NSKIP;
-  for(int ipara=0; ipara<Paras.size(); ipara++)
-    fileid << "_" << Paras[ipara].id << Paras[ipara].val;
+  if(!shortid) fileid << CACHEID << "_" << actnequi << "_" << NSKIP;
+
+  fileid << "_" << hash( paraString() );

 
   return fileid.str();
 }
 
   return fileid.str();
 }


@@ -72,7 +97,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   string truncIn, truncOut;
 
   filedesc->filename = infile;
   string truncIn, truncOut;
 
   filedesc->filename = infile;

-  filedesc->doVirtualEquilibration = false;

 
   if( infile.size() < 4 ) return false;
 
 
   if( infile.size() < 4 ) return false;
 


@@ -97,10 +121,6 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
            return false;
          break;
        case 2:
            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: 
          filedesc->nequi = atoi(inParts);
          break;
        case 3: 


@@ -115,7 +135,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   delete[] inchar;
 
 
   delete[] inchar;
 

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

 
   return true;
 }
 
   return true;
 }


@@ -179,12 +199,11 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
   return NULL;
 }
 

-/* returns number of equilibration-steps left */
-int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
+void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes)

 {
 {

-  int nequileft = NEQUI;
+  *readnewconfig = false;

 
 

-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;
+  if( DATADIR == "" || !(MODE==CACHE_MODE_RO||MODE==CACHE_MODE_RW) ) return;

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


@@ -194,35 +213,57 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);
   while(true)
     {
       vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);

+      int iDidVirtualSkips;

 
 

-      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return nequileft;
+      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) {
+       if (*readnewconfig)
+         *nequileft = nequileft_internal;
+       return;
+      }

 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {

+       string inFileParaString;
+

        openFileDesc = *inFileIt;
 
        openFileDesc = *inFileIt;
 

+       if (openFileDesc.nequi < NEQUI)
+         doVirtualEquilibration = true;
+       else
+         doVirtualEquilibration = false;
+
+       firstUsedConfig = true;
+

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

+       getline( inFile, inFileParaString );
+       if( inFileParaString != paraString() ) {
+         if(log) *log << "CCACHE: Parastring does not match. Closing dat-file..." << endl << flush;
+         inFile.close();
+       }
+

        inFiles.erase(inFileIt);
        
        if( !inFile.is_open() ) continue;
 
        inFiles.erase(inFileIt);
        
        if( !inFile.is_open() ) continue;
 

-       inBuffer = new boost::iostreams::filtering_istreambuf;
-       inBuffer->push( boost::iostreams::bzip2_decompressor() );
-       inBuffer->push(inFile);
+       ioBuffers->in = new boost::iostreams::filtering_istreambuf;
+       ioBuffers->in->push( boost::iostreams::bzip2_decompressor() );
+       ioBuffers->in->push(inFile);

       }
 
       if( inFile.is_open() ) 
        {
       }
 
       if( inFile.is_open() ) 
        {

-         if (openFileDesc.doVirtualEquilibration) {
+         if (doVirtualEquilibration) {

            if(log) *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++) {
+           doVirtualEquilibration = false;
+           for (iDidVirtualSkips=0; iDidVirtualSkips < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iDidVirtualSkips++) {

              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;

-             else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
+             else if ( (NEQUI-openFileDesc.nequi) - (iDidVirtualSkips+1)*openFileDesc.nskip < nequileft_internal ) {

                memcpy(configMem, tmpConfig, configSize);
                memcpy(configMem, tmpConfig, configSize);

-               nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
+               nequileft_internal = NEQUI - openFileDesc.nequi - (iDidVirtualSkips+1)*openFileDesc.nskip;
+               *readnewconfig = true;
+               firstUsedConfig = false;

              }
            }
          }
              }
            }
          }


@@ -230,7 +271,17 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
          if( readFullBlock(tmpConfig, configSize) == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);

-             return -1;
+             *readnewconfig = true;
+             if (firstUsedConfig) {
+               firstUsedConfig = false;
+               if (openFileDesc.nequi < NEQUI)
+                 nequileft_internal = NEQUI - openFileDesc.nequi - iDidVirtualSkips*openFileDesc.nskip;
+               else
+                 nequileft_internal = NEQUI - openFileDesc.nequi;
+             }
+             nequileft_internal -= openFileDesc.nskip;
+             *nequileft = nequileft_internal;
+             return;

            }
          else {
            if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
            }
          else {
            if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;


@@ -240,47 +291,65 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
     }
 }
 
     }
 }
 

-void configcache::openOutFile()
-{
+void configcache::openOutFile(int actnequi)
+{ 

   time_t secstamp = time(NULL);
   time_t secstamp = time(NULL);

+  int iseq=0;
+  
+  while (true) {
+    outFileName.str("");
+    outFileName << DATADIR << "/" << secstamp << "." << iseq << "_" << getFileId(actnequi) << "_.edat.tmp";

 
 

-  outFileName.str("");
-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";
+    int tmpfd = open(outFileName.str().c_str(), O_CREAT | O_EXCL, 0644);

 
 

+    if ( tmpfd != -1 ) {
+      close(tmpfd);
+      break;
+    }
+    else if ( errno != EEXIST ) {
+      if(log) *log << "CCACHE: Could not create cachefile!" << endl << flush;
+      exit(1);
+    }
+
+    iseq++;
+  }
+  

   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 

-  outBuffer = new boost::iostreams::filtering_ostreambuf;
-  outBuffer->push(boost::iostreams::bzip2_compressor());
-  outBuffer->push(outFile);
+  outFile << paraString() << endl;
+
+  ioBuffers->out = new boost::iostreams::filtering_ostreambuf;
+  ioBuffers->out->push(boost::iostreams::bzip2_compressor());
+  ioBuffers->out->push(outFile);

 }
 
 }
 

-void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size) {
+void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {

   unsigned long headeridhash;
 
   unsigned long headeridhash;
 

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

 
   if(!outFile.is_open())
 
   if(!outFile.is_open())

-    openOutFile();
+    openOutFile(actnequi);

 
   headeridhash = hash(headerid);
 
 
   headeridhash = hash(headerid);
 

-  boost::iostreams::write(*outBuffer, (char*)&size, sizeof(long unsigned int));
-  boost::iostreams::write(*outBuffer, (char*)&headeridhash, sizeof(unsigned long));
-  boost::iostreams::write(*outBuffer, header, size);
+  boost::iostreams::write(*ioBuffers->out, (char*)&size, sizeof(long unsigned int));
+  boost::iostreams::write(*ioBuffers->out, (char*)&headeridhash, sizeof(unsigned long));
+  boost::iostreams::write(*ioBuffers->out, header, size);

 }
 
 }
 

-void configcache::writeConfig()
+void configcache::writeConfig(int actnequi)

 {
   long unsigned int zeroheader=0;
 
 {
   long unsigned int zeroheader=0;
 

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

 
   if ( ! outFile.is_open() )
 
   if ( ! outFile.is_open() )

-    openOutFile();
+    openOutFile(actnequi);

   
   

-  boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));
+  boost::iostreams::write(*ioBuffers->out, (char*)&zeroheader, sizeof(long unsigned int));

 
 

-  boost::iostreams::write(*outBuffer, configMem, configSize);
+  boost::iostreams::write(*ioBuffers->out, configMem, configSize);

 }
 
 void configcache::addPara(const string& parid, const double& val){
 }
 
 void configcache::addPara(const string& parid, const double& val){


@@ -297,27 +366,29 @@ int configcache::getParIndex(const string& parid){
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;

+

   finishOutFile();
   finishOutFile();

-  if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
+  if(ioBuffers->in != NULL) { delete ioBuffers->in; ioBuffers->in=NULL; } 

   inFile.close();
   inFiles.clear();
 
   refetchDataFiles = true;
   inFile.close();
   inFiles.clear();
 
   refetchDataFiles = true;

+  nequileft_internal = NEQUI;

 }
 
 configcache::~configcache()
 {
   finishOutFile();
 }
 
 configcache::~configcache()
 {
   finishOutFile();

-  delete inBuffer;
-  inBuffer = NULL;
+  delete ioBuffers->in;
+  ioBuffers->in = NULL;

 }
 
 void configcache::finishOutFile()
 {
 }
 
 void configcache::finishOutFile()
 {

-  if( outBuffer != NULL )
+  if( ioBuffers->out != NULL )

     {
     {

-      delete outBuffer;
-      outBuffer = NULL;
+      delete ioBuffers->out;
+      ioBuffers->out = NULL;

     }
 
   if( outFile.is_open() )
     }
 
   if( outFile.is_open() )


@@ -344,7 +415,7 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
 
   if ( dataSize == 0 ) return 0;
 
 
   if ( dataSize == 0 ) return 0;
 

-  try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
+  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(boost::iostreams::bzip2_error& error) { 
     if(log) *log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
     inFile.close();