...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 670f02a02b9d8619c46b389d3536a772d19fc8ff..af0a206eb6c73ea126b392395ad1472f0b4d882a 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,7 +5,10 @@
 #include <time.h>
 #include <dirent.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;
@@ -20,6 +23,8 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   outBuffer = NULL;
   inBuffer = NULL;
 
+  MODE = cachemode;
+
   refetchDataFiles = false;
 }
 
@@ -71,8 +76,8 @@ bool configcache::isValidInFile(const string& infile)
       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; break;
+       case 3: if(atoi(inParts) != NSKIP) return false; break;
        }
       inParts = strtok( NULL, "_");
     }
@@ -80,14 +85,14 @@ bool configcache::isValidInFile(const string& infile)
 
   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()
 {
-  if(DATADIR == "") return false;
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -100,11 +105,23 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {
+         if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;
+
          inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
          inFiles.pop_back();
 
          if( !inFile.is_open() ) continue;
 
+         std::streampos fsize = inFile.tellg();
+          inFile.seekg( 0, std::ios::end );
+          fsize = inFile.tellg() - fsize;
+         if( fsize == 0 ) {
+           *out->log << "CCACHE: dat-file has zero length! Skipping." << endl << flush;
+           inFile.close();
+           continue;
+         }
+         inFile.seekg(0);
+
          inBuffer = new boost::iostreams::filtering_istreambuf;
          inBuffer->push( boost::iostreams::bzip2_decompressor() );
          inBuffer->push(inFile);
@@ -112,25 +129,32 @@ bool configcache::readConfig()
 
       if( inFile.is_open() ) 
        {
-         if( boost::iostreams::read(*inBuffer, tmpConfig, configSize) == configSize )
+         int readturn = -1;
+         try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+         catch (std::exception const& ex) {
+           if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
+           inFile.close();
+         }
+         
+         if( readturn == configSize && inFile.is_open() )
            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }
-         else inFile.close();
+         else inFile.close(); 
        }
     }
 }
 
 void configcache::writeConfig()
 {
-  if( DATADIR == "") return;
+  if( DATADIR == "" || MODE < 2 ) return;
 
   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;