added underscore in cacheid check

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 62b9fdb2ff6a2d9fac9fc76bfd8636b0eb64d303..bcfe92f05bd74dcb3ce90e600df6f313a5d1aa17 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -10,14 +10,19 @@
 #define HEADER_READLAST 2
 
 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
 #define HEADER_READLAST 2
 
 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;
+                        ostream *_log){
+  log = _log;

 
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;
   CACHEID = cacheid;
 
 
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;
   CACHEID = cacheid;
 

+  if ( cacheid.find("_") != -1 ) {
+    if(log) *log << "CCACHE: Invalid cacheid \"" << cacheid << "\" given. Cacheids must not contain underscores!" << endl << flush;
+    exit(1);
+  }
+

   configMem = (char*)malloc(configMemSize);
   tmpConfig = (char*)malloc(configMemSize);
 
   configMem = (char*)malloc(configMemSize);
   tmpConfig = (char*)malloc(configMemSize);
 


@@ -80,7 +85,7 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
   inchar = new char [infile.size()+1];
   strcpy (inchar, infile.c_str());
 
   inchar = new char [infile.size()+1];
   strcpy (inchar, infile.c_str());

-  
+

   inParts = strtok( inchar, "_" );
   for(int iPart=0; inParts!=NULL; iPart++)
     {
   inParts = strtok( inchar, "_" );
   for(int iPart=0; inParts!=NULL; iPart++)
     {


@@ -88,7 +93,10 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
 
       switch(iPart)
        {
 
       switch(iPart)
        {

-       case 1: if(inParts != CACHEID) return false; break;
+       case 1: if(inParts != CACHEID) {
+           return false; 
+           break;
+         }

        case 2: 
          if (atoi(inParts) > NEQUI) 
            return false; 
        case 2: 
          if (atoi(inParts) > NEQUI) 
            return false; 


@@ -131,19 +139,19 @@ int configcache::readHeader()
        return HEADER_READOK;
       }
       else {
        return HEADER_READOK;
       }
       else {

-       if(out) *out->log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush;
+       if(log) *log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush;

        inFile.close();
        return HEADER_READERR;
       }
     }
     else {
        inFile.close();
        return HEADER_READERR;
       }
     }
     else {

-      if(out) *out->log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush;
+      if(log) *log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush;

       inFile.close();
       return HEADER_READERR;
     }
   }
   else {
       inFile.close();
       return HEADER_READERR;
     }
   }
   else {

-    if(out) *out->log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush;
+    if(log) *log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush;

     inFile.close();
     return HEADER_READERR;
   }
     inFile.close();
     return HEADER_READERR;
   }


@@ -172,9 +180,12 @@ void * configcache::getHeader(const string& headerid) {
   return NULL;
 }
 
   return NULL;
 }
 

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

 {
 {

-  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
+  int nequileft = NEQUI;
+
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return nequileft;

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


@@ -183,15 +194,18 @@ bool configcache::readConfig()
 
   while(true)
     {
 
   while(true)
     {

-      if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
+      vector<infiledesc>::iterator inFileIt = getNextInfile(excludeFileHashes);

 
 

-      while( (!inFile.is_open()) && inFiles.size() > 0 ) {
-       if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+      if( (!inFile.is_open()) && inFileIt == inFiles.end() ) return nequileft;

 
 

-       openFileDesc = inFiles.back();
-       inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
-       inFiles.pop_back();
+      while( (!inFile.is_open()) && inFiles.size() > 0 ) {
+       openFileDesc = *inFileIt;

 
 

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

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


@@ -202,21 +216,25 @@ bool configcache::readConfig()
       if( inFile.is_open() ) 
        {
          if (openFileDesc.doVirtualEquilibration) {
       if( inFile.is_open() ) 
        {
          if (openFileDesc.doVirtualEquilibration) {

-           if(out) *out->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++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;
            openFileDesc.doVirtualEquilibration = false;
            for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
                break;

+             else if ( (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip < nequileft ) {
+               memcpy(configMem, tmpConfig, configSize);
+               nequileft = (NEQUI-openFileDesc.nequi) - (iskip+1)*openFileDesc.nskip;
+             }

            }
          }
 
          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 true;
+             return -1;

            }
          else {
            }
          else {

-           if(out) *out->log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
+           if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;

            inFile.close();
          }
        }
            inFile.close();
          }
        }


@@ -228,7 +246,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 +255,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;


@@ -328,15 +347,15 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
 
   try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
   catch(boost::iostreams::bzip2_error& error) { 
 
   try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
   catch(boost::iostreams::bzip2_error& error) { 

-    if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
+    if(log) *log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;

     inFile.close();
   } 
   catch (std::exception const& ex) {
     inFile.close();
   } 
   catch (std::exception const& ex) {

-    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
+    if(log) *log << "CCACHE: Caught exception: " << ex.what() << endl << flush;

     inFile.close();
   }
   catch( ... ) {
     inFile.close();
   }
   catch( ... ) {

-    if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
+    if(log) *log << "CCACHE: Caught unknown exception while reading." << endl << flush;

     inFile.close();
   }
 
     inFile.close();
   }
 


@@ -360,3 +379,22 @@ void configcache::deleteHeaderStore()
     headerStore.pop_back();
   }
 }
     headerStore.pop_back();
   }
 }

+
+vector<infiledesc>::iterator configcache::getNextInfile(vector<unsigned long> *excludeFileHashes) {
+  for (vector<infiledesc>::iterator init = inFiles.begin(); init != inFiles.end(); ++init) {
+    if (excludeFileHashes != NULL) {
+      bool excludethisfile = false;
+
+      for (vector<unsigned long>::iterator exit = excludeFileHashes->begin(); exit != excludeFileHashes->end(); ++exit)
+       if ( *exit == hash(init->filename) ) {
+         excludethisfile = true;
+         break;
+       }
+
+      if (excludethisfile)
+       continue;
+    }
+    return init;
+  }
+  return inFiles.end();
+}