removed debug messages.

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 3227233b8be515f7c095f3fb7cc95a6283841197..f07ccf50f1cb51ae682f5dc17425fa4e70285243 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -12,6 +12,12 @@
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 

+#include "writeout.h"
+
+#define CACHE_MODE_DISABLED 0
+#define CACHE_MODE_READ 1
+#define CACHE_MODE_FULL 2
+

 using namespace std;
 
 struct parameter{
 using namespace std;
 
 struct parameter{


@@ -19,27 +25,45 @@ struct parameter{
   double val;
 };
 
   double val;
 };
 

+struct infiledesc {
+  string filename;
+  int nequi;
+  int nskip;
+  bool doVirtualEquilibration;
+  bool extended;
+};
+

 class configcache{
  public:
   ~configcache();
 class configcache{
  public:
   ~configcache();

-  configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize);
-  bool readConfig();
+  configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
+             const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL);
+  int readConfig(vector<unsigned long> *excludeFileHashes=NULL);

   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(const string& headerid, const char *header, long unsigned int size);
+  void * getHeader(const string& headerid);
+  string getOutFileName() { return outFileName.str(); }
+  string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
+  static unsigned long hash(const string& str);
+

  private:
  private:

+  infiledesc openFileDesc;

   void finishOutFile();
   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   string DATADIR;
   string CACHEID;
   void finishOutFile();
   int getParIndex(const string& parid);
   int NEQUI;
   int NSKIP;
   string DATADIR;
   string CACHEID;

+  int MODE;

   string getFileId(const bool& shortid=false);
 
   ofstream outFile;
   ifstream inFile;
 
   string getFileId(const bool& shortid=false);
 
   ofstream outFile;
   ifstream inFile;
 

+  writeout *out;
+

   stringstream outFileName;
 
   int readnum;
   stringstream outFileName;
 
   int readnum;


@@ -57,11 +81,27 @@ class configcache{
 
   void fetchDataFiles();
   
 
   void fetchDataFiles();
   

-  bool isValidInFile(const string& infile);
+  bool isValidInFile(const string& infile, infiledesc *filedesc);

 
 

-  vector<string> inFiles;
+  vector<infiledesc> inFiles;

 
   vector<parameter> Paras;
 
   vector<parameter> Paras;

+
+  int readDataToMem(char *tmpData, long unsigned int dataSize);
+
+  void openOutFile();
+
+  int readHeader();
+
+  bool headerWritten;
+
+  int readFullBlock(char *tmpData, long unsigned int dataSize);
+
+  vector< pair<unsigned long, void *> > headerStore;
+
+  void deleteHeaderStore();
+
+  bool readAllHeaders();

 };
 
 #endif
 };
 
 #endif