X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/6ad2fe3a6550b77888c46b17f81d8ab74406649d..061e6469f58f3e3e892f1cd1f6fdd2aad9c644e8:/configcache.h

diff --git a/configcache.h b/configcache.h
index 8146b27..74998c7 100644
--- a/configcache.h
+++ b/configcache.h
@@ -7,15 +7,12 @@
 #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>
+#include "datread.h"
 
-#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;
 
@@ -29,14 +26,15 @@ struct infiledesc {
   int nequi;
   int nskip;
   bool extended;
+  bool superextended;
 };
 
 class configcache{
  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);
-  void readConfig(bool& readnewconfig, int& nequileft, vector<unsigned long> *excludeFileHashes=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 setPara(const string& parid, const double& value);
@@ -45,33 +43,33 @@ class configcache{
   string getOutFileName() { return outFileName.str(); }
   string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
   static unsigned long hash(const string& str);
-  void closeInFile() { inFile.close(); }
+  void closeInFile() { dataReader->closeFile(); }
   int inFilesLeft() { return inFiles.size(); }
   char* getConfigMem() { return configMem; }
   int getConfigSize() { return configSize; }
+  bool isOutFileOpen () { return outFile.is_open(); }
+  void finishOutFile();
 
  private:
+  struct iobuffers;
+  iobuffers *ioBuffers;
+
   ostream* log;
   infiledesc openFileDesc;
-  void finishOutFile();
   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   string DATADIR;
   string CACHEID;
   int MODE;
-  string getFileId(int actnequi, const bool& shortid=false);
+  string getFileId(int actnequi, const bool& superextended=true, const bool& shortid=false);
 
   ofstream outFile;
-  ifstream inFile;
 
   stringstream outFileName;
 
   int readnum;
 
-  boost::iostreams::filtering_istreambuf *inBuffer;
-  boost::iostreams::filtering_ostreambuf *outBuffer;
-
   int inSize;
 
   int configSize;
@@ -88,20 +86,12 @@ class configcache{
 
   vector<parameter> Paras;
 
-  int readDataToMem(char *tmpData, long unsigned int dataSize);
-
   void openOutFile(int actnequi);
 
   int readHeader();
 
   bool headerWritten;
 
-  int readFullBlock(char *tmpData, long unsigned int dataSize);
-
-  vector< pair<unsigned long, void *> > headerStore;
-
-  void deleteHeaderStore();
-
   bool readAllHeaders();
 
   vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
@@ -109,6 +99,10 @@ class configcache{
   int nequileft_internal;
 
   bool doVirtualEquilibration, firstUsedConfig;
+
+  string paraString();
+
+  datread *dataReader;
 };
 
 #endif