Implemented rw-cache. Made general options uppercase. Formatted options.

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 727d1bd325007845bc06bef38b4e0cabcc1a8652..6054198a725b6795aa767982c02f185db7e889b3 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -7,15 +7,10 @@
 #include <sstream>
 #include <ostream>
 
 #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
+#define CACHE_MODE_OO 0
+#define CACHE_MODE_RO 1
+#define CACHE_MODE_WO 2
+#define CACHE_MODE_RW 3

 
 using namespace std;
 
 
 using namespace std;
 


@@ -35,7 +30,7 @@ class configcache{
  public:
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
  public:
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 

-             const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);
+             const int& cachemode=CACHE_MODE_RW, ostream *_log=NULL);

   void readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes=NULL);
   void writeConfig(int actnequi);
   void addPara(const string& parid, const double& val=0);
   void readConfig(bool *readnewconfig, int *nequileft, vector<unsigned long> *excludeFileHashes=NULL);
   void writeConfig(int actnequi);
   void addPara(const string& parid, const double& val=0);


@@ -53,6 +48,9 @@ class configcache{
   void finishOutFile();
 
  private:
   void finishOutFile();
 
  private:

+  struct iobuffers;
+  iobuffers *ioBuffers;
+

   ostream* log;
   infiledesc openFileDesc;
   int getParIndex(const string& parid);
   ostream* log;
   infiledesc openFileDesc;
   int getParIndex(const string& parid);


@@ -70,9 +68,6 @@ class configcache{
 
   int readnum;
 
 
   int readnum;
 

-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-

   int inSize;
 
   int configSize;
   int inSize;
 
   int configSize;