X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/b21135b68cb3d4155bbcabea8636baefcc0cf38d..836ca8cca791128595d9514b6d03a47dc32dd7a4:/configcache.cpp?ds=sidebyside

diff --git a/configcache.cpp b/configcache.cpp
index 48c31f4..f00e187 100644
--- 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, "_");
     }
@@ -87,7 +92,7 @@ bool configcache::isValidInFile(const string& infile)
 
 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( (int)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,19 +129,26 @@ 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);