Changed hashed parastring cachfilename postfix to sdat and made configcache backward...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index ef085d8cb25815d78d02ccbfc258ee4332b5f6d6..491256c1aeaa47185f0e430e37151750c29aa465 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,34 @@ 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(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;
 {
   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();
 }
 
   return fileid.str();
 }


@@ -75,10 +103,18 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   if( infile.size() < 4 ) return false;
 
 
   if( infile.size() < 4 ) return false;
 

-  if( infile.substr(infile.size()-4) == ".dat" )
+  if( infile.substr(infile.size()-4) == ".dat" ) {

     filedesc->extended = false;
     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->extended = true;

+    filedesc->superextended = true;
+  }

   else
     return false;
 
   else
     return false;
 


@@ -110,7 +146,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   delete[] inchar;
 
 
   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;
 }
 
   return true;
 }


@@ -178,7 +214,7 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 {
   *readnewconfig = false;
 
 {
   *readnewconfig = false;
 

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

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


@@ -197,6 +233,8 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
       }
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
       }
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {

+       string inFileParaString;
+

        openFileDesc = *inFileIt;
 
        if (openFileDesc.nequi < NEQUI)
        openFileDesc = *inFileIt;
 
        if (openFileDesc.nequi < NEQUI)


@@ -209,13 +247,21 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
        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 );
        

+       if( openFileDesc.superextended ) {
+         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() ) 


@@ -261,44 +307,62 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 void configcache::openOutFile(int actnequi)
 { 
   time_t secstamp = time(NULL);
 void configcache::openOutFile(int actnequi)
 { 
   time_t secstamp = time(NULL);

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

 
 

-  outFileName.str("");
-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId(actnequi) << "_.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, int actnequi) {
   unsigned long headeridhash;
 
 }
 
 void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {
   unsigned long headeridhash;
 

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

 
   if(!outFile.is_open())
     openOutFile(actnequi);
 
   headeridhash = hash(headerid);
 
 
   if(!outFile.is_open())
     openOutFile(actnequi);
 
   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(int actnequi)
 {
   long unsigned int zeroheader=0;
 
 }
 
 void configcache::writeConfig(int actnequi)
 {
   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() )
     openOutFile(actnequi);
   
 
   if ( ! outFile.is_open() )
     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){


@@ -317,7 +381,7 @@ void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
 
   finishOutFile();
   Paras[getParIndex(parid)].val = value;
 
   finishOutFile();

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

   inFile.close();
   inFiles.clear();
 
   inFile.close();
   inFiles.clear();
 


@@ -328,16 +392,16 @@ void configcache::setPara(const string& parid, const double& value){
 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() )


@@ -364,7 +428,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();