...

diff --git a/configcache.cpp b/configcache.cpp
index 96dc470ef8e247b740b2ab8fbcd8c8b670229121..1b227578bea85c73835bffce7c343674340d109c 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -67,7 +67,12 @@ 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()-3) != "dat" ) return false;
+  if( infile.substr(infile.size()-4) == ".dat" )
+    filedesc->extended = false;
+  else if( infile.substr(infile.size()-4) == "edat" )
+    filedesc->extended = true;
+  else
+    return false;

 
   inchar = new char [infile.size()+1];
   strcpy (inchar, infile.c_str());
 
   inchar = new char [infile.size()+1];
   strcpy (inchar, infile.c_str());


@@ -104,6 +109,55 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   return true;
 }
 
   return true;
 }
 

+bool configcache::openInFile() {
+  while( (!inFile.is_open()) && inFiles.size() > 0 )
+    {
+      if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back().filename << endl << flush;
+
+      openFileDesc = inFiles.back();
+      inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
+      inFiles.pop_back();
+
+      if( !inFile.is_open() ) continue;
+
+      inBuffer = new boost::iostreams::filtering_istreambuf;
+      inBuffer->push( boost::iostreams::bzip2_decompressor() );
+      inBuffer->push(inFile);
+
+      return true;
+    }
+
+  return false;
+}
+
+void configcache::readHeader()
+{
+  int headersize;
+  
+  if( readDataToMem((char*)&headersize, sizeof(int)) == sizeof(int) && inFile.is_open() )
+    {
+      if( headerData != NULL ) delete headerData;
+
+      headerData = new char(headersize);
+      
+      if( readDataToMem(headerData, headersize) == headersize && inFile.is_open() ) {
+       if(out) *out->log << "CCACHE: Read header information." << endl << flush;
+      }
+      else {
+       if(out) *out->log << "CCACHE: Could not read header! Closing dat-file: " << openFileDesc.filename << endl << flush;
+       inFile.close();
+      }
+    }
+  else {
+    if(out) *out->log << "CCACHE: Could not read header size! Closing dat-file: " << openFileDesc.filename << endl << flush;
+    inFile.close();
+  }
+}
+
+void *configcache::getHeader() {
+  return headerData;
+}
+

 bool configcache::readConfig()
 {
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
 bool configcache::readConfig()
 {
   if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;


@@ -117,20 +171,9 @@ bool configcache::readConfig()
     {
       if( (!inFile.is_open()) && inFiles.size() == 0 ) return false;
 
     {
       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;
-
-         openFileDesc = inFiles.back();
-         inFile.open( (DATADIR + "/" + inFiles.back().filename).c_str(), std::ios::binary );
-         inFiles.pop_back();
-
-         if( !inFile.is_open() ) continue;
-
-         inBuffer = new boost::iostreams::filtering_istreambuf;
-         inBuffer->push( boost::iostreams::bzip2_decompressor() );
-         inBuffer->push(inFile);
-       }
+      /* read header information */
+      if ( openInFile() && openFileDesc.extended )
+       readHeader();

 
       if( inFile.is_open() ) 
        {
 
       if( inFile.is_open() ) 
        {


@@ -138,38 +181,56 @@ bool configcache::readConfig()
            if(out) *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
            openFileDesc.doVirtualEquilibration = false;
            for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
            if(out) *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
            openFileDesc.doVirtualEquilibration = false;
            for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {

-             if( readConfigToMem(tmpConfig) != configSize || ! inFile.is_open() )
+             if( readDataToMem(tmpConfig, configSize) != configSize || ! inFile.is_open() )

                break;
            }
          }
 
                break;
            }
          }
 

-         if( readConfigToMem(tmpConfig) == configSize && inFile.is_open() )
+         if( readDataToMem(tmpConfig, configSize) == configSize && inFile.is_open() )

            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }
          else {
            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }
          else {

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

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

-void configcache::writeConfig()
+void configcache::openOutFile()

 {
 {

+  time_t secstamp = time(NULL);
+
+  outFileName.str("");
+  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";    
+  outFile.open( outFileName.str().c_str(), std::ios::binary );
+
+  outBuffer = new boost::iostreams::filtering_ostreambuf;
+  outBuffer->push(boost::iostreams::bzip2_compressor());
+  outBuffer->push(outFile);
+}
+
+void configcache::writeHeader(char *header, const int& size) {

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

-  if(!outFile.is_open()){
-    time_t secstamp = time(NULL);
+  if(!outFile.is_open()) {
+    openOutFile();
+    boost::iostreams::write(*outBuffer, header, size);
+  }
+  else
+    if(out) *out->log << "CCACHE: Not writing header because outfile is already open!" << endl << flush;
+}

 
 

-    outFileName.str("");
-    outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.dat.tmp";    
-    outFile.open( outFileName.str().c_str(), std::ios::binary );
+void configcache::writeConfig()
+{
+  if( DATADIR == "" || MODE < 2 ) return;

 
 

-    outBuffer = new boost::iostreams::filtering_ostreambuf;
-    outBuffer->push(boost::iostreams::bzip2_compressor());
-    outBuffer->push(outFile);
+  if(!outFile.is_open()){
+    int zeroheader=0;
+    openOutFile();
+    boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(int));

   }
 
   boost::iostreams::write(*outBuffer, configMem, configSize);
   }
 
   boost::iostreams::write(*outBuffer, configMem, configSize);


@@ -219,11 +280,13 @@ void configcache::finishOutFile()
     }
 }
 
     }
 }
 

-int configcache::readConfigToMem(char *tmpConfig)
+int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)

 {
   int readturn = -1;
 
 {
   int readturn = -1;
 

-  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+  if ( dataSize == 0 ) return 0;
+
+  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;
     inFile.close();
   catch(boost::iostreams::bzip2_error& error) { 
     if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
     inFile.close();

diff --git a/configcache.h b/configcache.h
index 3dda989c437de8b221c209d5ba70cce7dfef8d53..139218b9cbf3b11c7ea6582cea2cc5f83ae4f1f4 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -30,6 +30,7 @@ struct infiledesc {
   int nequi;
   int nskip;
   bool doVirtualEquilibration;
   int nequi;
   int nskip;
   bool doVirtualEquilibration;

+  bool extended;

 };
 
 class configcache{
 };
 
 class configcache{


@@ -41,6 +42,8 @@ class configcache{
   void writeConfig();
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
   void writeConfig();
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);

+  void writeHeader(char *header, const int& size);
+  void *getHeader();

   
  private:
   infiledesc openFileDesc;
   
  private:
   infiledesc openFileDesc;


@@ -81,7 +84,14 @@ class configcache{
 
   vector<parameter> Paras;
 
 
   vector<parameter> Paras;
 

-  int readConfigToMem(char *tmpConfig);
+  int readDataToMem(char *tmpData, long unsigned int dataSize);
+
+  void openOutFile();
+  bool openInFile();
+
+  char *headerData;
+
+  void readHeader();

 };
 
 #endif
 };
 
 #endif