implemented multiple datablock headers.

diff --git a/configcache.cpp b/configcache.cpp
index fcfdd8eb2582503fd23defc645f135ea45eb2317..62b9fdb2ff6a2d9fac9fc76bfd8636b0eb64d303 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,6 +5,10 @@
 #include <time.h>
 #include <dirent.h>
 
 #include <time.h>
 #include <dirent.h>
 

+#define HEADER_READOK   0
+#define HEADER_READERR  1
+#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;
 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;


@@ -26,8 +30,6 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   MODE = cachemode;
 
   refetchDataFiles = false;
   MODE = cachemode;
 
   refetchDataFiles = false;

-
-  readHeaderData = NULL;

 }
 
 string configcache::getFileId(const bool& shortid)
 }
 
 string configcache::getFileId(const bool& shortid)


@@ -111,34 +113,63 @@ bool configcache::isValidInFile(const string& infile, infiledesc *filedesc)
   return true;
 }
 
   return true;
 }
 

-bool configcache::readHeader()
+int configcache::readHeader()

 {
   long unsigned int headersize;
 {
   long unsigned int headersize;

+  
+  if( readDataToMem((char *)&headersize, sizeof(long unsigned int)) == sizeof(long unsigned int) && inFile.is_open() ) {
+    if ( headersize == 0 )
+      return HEADER_READLAST;

 
 

-  if( readDataToMem((char*)&headersize, sizeof(long unsigned int)) == sizeof(long unsigned int) && inFile.is_open() )
-    {
-      if( readHeaderData != NULL ) free(readHeaderData);
+    pair<unsigned long, void *> newHeader;

 
 

-      readHeaderData = (char*) malloc(headersize);
+    if( readDataToMem((char *)&newHeader.first, sizeof(unsigned long)) == sizeof(unsigned long) && inFile.is_open() ) {
+      newHeader.second = malloc(headersize);

 
 

-      if( readDataToMem(readHeaderData, headersize) == headersize && inFile.is_open() ) {
-       return true;
+      if( readDataToMem((char *)newHeader.second, headersize) == headersize && inFile.is_open() ) {
+       headerStore.push_back(newHeader);
+       return HEADER_READOK;

       }
       else {
       }
       else {

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

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

-       return false;
+       return HEADER_READERR;

       }
     }
       }
     }

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

   else {
     if(out) *out->log << "CCACHE: Could not read header size. 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();

-    return false;
+    return HEADER_READERR;

   }
 }
 
   }
 }
 

-void *configcache::getHeader() {
-  return readHeaderData;
+bool configcache::readAllHeaders()
+{
+  int readHeaderStatus;
+
+  deleteHeaderStore();
+  
+  do {
+    readHeaderStatus = readHeader();
+  }
+  while ( readHeaderStatus == HEADER_READOK );
+
+  if ( readHeaderStatus == HEADER_READLAST ) return true;
+  else if ( readHeaderStatus == HEADER_READERR ) return false;
+}
+
+void * configcache::getHeader(const string& headerid) {
+  for (vector< pair<unsigned long, void *> >::iterator headerStoreIt = headerStore.begin(); headerStoreIt != headerStore.end(); ++headerStoreIt)
+    if ( headerStoreIt->first == hash(headerid) )
+      return headerStoreIt->second;
+  
+  return NULL;

 }
 
 bool configcache::readConfig()
 }
 
 bool configcache::readConfig()


@@ -203,36 +234,35 @@ void configcache::openOutFile()
   outBuffer = new boost::iostreams::filtering_ostreambuf;
   outBuffer->push(boost::iostreams::bzip2_compressor());
   outBuffer->push(outFile);
   outBuffer = new boost::iostreams::filtering_ostreambuf;
   outBuffer->push(boost::iostreams::bzip2_compressor());
   outBuffer->push(outFile);

-
-  headerWritten = false;

 }
 
 }
 

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

   if( DATADIR == "" || MODE < 2 ) return;
 
   if(!outFile.is_open())
     openOutFile();
 
   if( DATADIR == "" || MODE < 2 ) return;
 
   if(!outFile.is_open())
     openOutFile();
 

+  headeridhash = hash(headerid);
+

   boost::iostreams::write(*outBuffer, (char*)&size, sizeof(long unsigned int));
   boost::iostreams::write(*outBuffer, (char*)&size, sizeof(long unsigned int));

+  boost::iostreams::write(*outBuffer, (char*)&headeridhash, sizeof(unsigned long));

   boost::iostreams::write(*outBuffer, header, size);
   boost::iostreams::write(*outBuffer, header, size);

-
-  headerWritten = true;

 }
 
 void configcache::writeConfig()
 {
 }
 
 void configcache::writeConfig()
 {

+  long unsigned int zeroheader=0;
+

   if ( DATADIR == "" || MODE < 2 ) return;
 
   if ( ! outFile.is_open() )
     openOutFile();
   
   if ( DATADIR == "" || MODE < 2 ) return;
 
   if ( ! outFile.is_open() )
     openOutFile();
   

-  if ( ! headerWritten ) {
-    long unsigned int zeroheader=0;
-    boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));
-  }
+  boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));

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

-  headerWritten = false;

 }
 
 void configcache::addPara(const string& parid, const double& val){
 }
 
 void configcache::addPara(const string& parid, const double& val){


@@ -283,7 +313,7 @@ int configcache::readFullBlock(char *tmpData, long unsigned int dataSize)
 {
   /* try to read header */
   if ( openFileDesc.extended )
 {
   /* try to read header */
   if ( openFileDesc.extended )

-    if ( ! readHeader() ) 
+    if ( ! readAllHeaders() ) 

       return -1;
 
   /* read data */
       return -1;
 
   /* read data */


@@ -312,3 +342,21 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
 
   return readturn;
 }
 
   return readturn;
 }

+
+unsigned long configcache::hash(const string& str)
+{
+  unsigned long hash = 5381;
+
+  for(string::const_iterator it=str.begin();it!=str.end();it++) 
+    hash = ((hash << 5) + hash) + *it; /* hash * 33 + character */
+
+  return hash;
+}
+
+void configcache::deleteHeaderStore()
+{
+  while ( headerStore.size() > 0 ) {
+    free(headerStore.back().second);
+    headerStore.pop_back();
+  }
+}

diff --git a/configcache.h b/configcache.h
index 4aa245e5e69902e896325498870d8249dad7605a..3c521d97d1427a3e575fdc270391b8ab405487a6 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -42,8 +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, long unsigned int size);
-  void *getHeader();
+  void writeHeader(const string& headerid, char *header, long unsigned int size);
+  void * getHeader(const string& headerid);

   
  private:
   infiledesc openFileDesc;
   
  private:
   infiledesc openFileDesc;


@@ -88,13 +88,19 @@ class configcache{
 
   void openOutFile();
 
 
   void openOutFile();
 

-  char *readHeaderData;
-
-  bool readHeader();
+  int readHeader();

 
   bool headerWritten;
 
   int readFullBlock(char *tmpData, long unsigned int dataSize);
 
   bool headerWritten;
 
   int readFullBlock(char *tmpData, long unsigned int dataSize);

+
+  static unsigned long hash(const string& str);
+
+  vector< pair<unsigned long, void *> > headerStore;
+
+  void deleteHeaderStore();
+
+  bool readAllHeaders();

 };
 
 #endif
 };
 
 #endif