Moved boost headers in configcache to source file.

diff --git a/configcache.cpp b/configcache.cpp
index ef085d8cb25815d78d02ccbfc258ee4332b5f6d6..c6f90821090240d9f9e36ae68b691e2f92c7d132 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,10 +5,22 @@
 #include <time.h>
 #include <dirent.h>
 
+#include <boost/iostreams/filtering_streambuf.hpp>
+#include <boost/iostreams/stream.hpp>
+#include <boost/iostreams/filter/bzip2.hpp>
+#include <boost/iostreams/device/array.hpp>
+#include <boost/iostreams/copy.hpp>
+
 #define HEADER_READOK   0
 #define HEADER_READERR  1
 #define HEADER_READLAST 2
 
+struct configcache::iobuffers
+{
+  boost::iostreams::filtering_istreambuf *in;
+  boost::iostreams::filtering_ostreambuf *out;
+};
+
 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
                         ostream *_log){
   log = _log;
@@ -29,8 +41,9 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   *configmem = configMem;
   configSize = configMemSize;
 
-  outBuffer = NULL;
-  inBuffer = NULL;
+  ioBuffers = new iobuffers;
+  ioBuffers->in = NULL;
+  ioBuffers->out = NULL;
 
   MODE = cachemode;
 
@@ -213,9 +226,9 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
        
        if( !inFile.is_open() ) continue;
 
-       inBuffer = new boost::iostreams::filtering_istreambuf;
-       inBuffer->push( boost::iostreams::bzip2_decompressor() );
-       inBuffer->push(inFile);
+       ioBuffers->in = new boost::iostreams::filtering_istreambuf;
+       ioBuffers->in->push( boost::iostreams::bzip2_decompressor() );
+       ioBuffers->in->push(inFile);
       }
 
       if( inFile.is_open() ) 
@@ -267,9 +280,9 @@ void configcache::openOutFile(int actnequi)
 
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
-  outBuffer = new boost::iostreams::filtering_ostreambuf;
-  outBuffer->push(boost::iostreams::bzip2_compressor());
-  outBuffer->push(outFile);
+  ioBuffers->out = new boost::iostreams::filtering_ostreambuf;
+  ioBuffers->out->push(boost::iostreams::bzip2_compressor());
+  ioBuffers->out->push(outFile);
 }
 
 void configcache::writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi) {
@@ -282,9 +295,9 @@ void configcache::writeHeader(const string& headerid, const char *header, long u
 
   headeridhash = hash(headerid);
 
-  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(*ioBuffers->out, (char*)&size, sizeof(long unsigned int));
+  boost::iostreams::write(*ioBuffers->out, (char*)&headeridhash, sizeof(unsigned long));
+  boost::iostreams::write(*ioBuffers->out, header, size);
 }
 
 void configcache::writeConfig(int actnequi)
@@ -296,9 +309,9 @@ void configcache::writeConfig(int actnequi)
   if ( ! outFile.is_open() )
     openOutFile(actnequi);
   
-  boost::iostreams::write(*outBuffer, (char*)&zeroheader, sizeof(long unsigned int));
+  boost::iostreams::write(*ioBuffers->out, (char*)&zeroheader, sizeof(long unsigned int));
 
-  boost::iostreams::write(*outBuffer, configMem, configSize);
+  boost::iostreams::write(*ioBuffers->out, configMem, configSize);
 }
 
 void configcache::addPara(const string& parid, const double& val){
@@ -317,7 +330,7 @@ void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
 
   finishOutFile();
-  if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
+  if(ioBuffers->in != NULL) { delete ioBuffers->in; ioBuffers->in=NULL; } 
   inFile.close();
   inFiles.clear();
 
@@ -328,16 +341,16 @@ void configcache::setPara(const string& parid, const double& value){
 configcache::~configcache()
 {
   finishOutFile();
-  delete inBuffer;
-  inBuffer = NULL;
+  delete ioBuffers->in;
+  ioBuffers->in = NULL;
 }
 
 void configcache::finishOutFile()
 {
-  if( outBuffer != NULL )
+  if( ioBuffers->out != NULL )
     {
-      delete outBuffer;
-      outBuffer = NULL;
+      delete ioBuffers->out;
+      ioBuffers->out = NULL;
     }
 
   if( outFile.is_open() )
@@ -364,7 +377,7 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
 
   if ( dataSize == 0 ) return 0;
 
-  try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
+  try { readturn = boost::iostreams::read(*ioBuffers->in, tmpData, dataSize); }
   catch(boost::iostreams::bzip2_error& error) { 
     if(log) *log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
     inFile.close();

diff --git a/configcache.h b/configcache.h
index 727d1bd325007845bc06bef38b4e0cabcc1a8652..158eb0ae85f87cdea8d1ad8f97a985cb54186f15 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -7,12 +7,6 @@
 #include <sstream>
 #include <ostream>
 
-#include <boost/iostreams/filtering_streambuf.hpp>
-#include <boost/iostreams/stream.hpp>
-#include <boost/iostreams/filter/bzip2.hpp>
-#include <boost/iostreams/device/array.hpp>
-#include <boost/iostreams/copy.hpp>
-
 #define CACHE_MODE_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2
@@ -53,6 +47,9 @@ class configcache{
   void finishOutFile();
 
  private:
+  struct iobuffers;
+  iobuffers *ioBuffers;
+
   ostream* log;
   infiledesc openFileDesc;
   int getParIndex(const string& parid);
@@ -70,9 +67,6 @@ class configcache{
 
   int readnum;
 
-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-
   int inSize;
 
   int configSize;

diff --git a/hypercache.cpp b/hypercache.cpp
index e6864ac38ac4799102ae2b72046d6577719a45b3..26c86266c6d4e827fd067bd233e07719ed7a508d 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -1,5 +1,8 @@
 #include "hypercache.h"
 
+#include <cstdlib>
+#include <cstring>
+
 configcache *hypercache::C = NULL;
 vector<hypercache::para> hypercache::delayedParaAdd;
 vector<hypercache::para> hypercache::delayedParaSet;