implemented concurrent obscache confcache protection.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 62b9fdb2ff6a2d9fac9fc76bfd8636b0eb64d303..b375230174beb942e736dd2388affec9b0225059 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -172,8 +172,8 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
   return NULL;
 }
 

-bool configcache::readConfig()
-{
+bool configcache::readConfig(vector<string> *excludefiles)
+{   

   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
 
   if(refetchDataFiles){
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
 
   if(refetchDataFiles){


@@ -186,12 +186,26 @@ bool configcache::readConfig()
       if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {
       if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
 
       while( (!inFile.is_open()) && inFiles.size() > 0 ) {

-       if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+       bool excludethisfile=false;

 
        openFileDesc = inFiles.back();
 
        openFileDesc = inFiles.back();

-       inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
-       inFiles.pop_back();

 
 

+       if (excludefiles != NULL)
+         for (vector<string>::iterator exit = excludefiles->begin(); exit != excludefiles->end(); ++exit)
+           if ( *exit == inFiles.back().filename ) {
+             excludethisfile = true;
+             break;
+           }
+             
+       if ( ! excludethisfile ) {
+         if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+         inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
+       }
+       else
+         if(out) *out->log << "CCACHE: Excluded dat-file: " << inFiles.back().filename << endl << flush;
+       
+       inFiles.pop_back();
+       

        if( !inFile.is_open() ) continue;
 
        inBuffer = new boost::iostreams::filtering_istreambuf;
        if( !inFile.is_open() ) continue;
 
        inBuffer = new boost::iostreams::filtering_istreambuf;


@@ -228,7 +242,8 @@ void configcache::openOutFile()
   time_t secstamp = time(NULL);
 
   outFileName.str("");
   time_t secstamp = time(NULL);
 
   outFileName.str("");

-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";    
+  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.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;


@@ -236,7 +251,7 @@ void configcache::openOutFile()
   outBuffer->push(outFile);
 }
 
   outBuffer->push(outFile);
 }
 

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

   unsigned long headeridhash;
 
   if( DATADIR == "" || MODE < 2 ) return;
   unsigned long headeridhash;
 
   if( DATADIR == "" || MODE < 2 ) return;