...

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 437294684d559e7d652e768a61087cac0040f752..d79afa685d802b2132e9daa41d82a6941a3d41b5 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <fstream>
 #include <sstream>
 #include <string>
 #include <fstream>
 #include <sstream>

+#include <ostream>

 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>


@@ -23,16 +24,32 @@ 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, const int& cachemode=CACHE_MODE_FULL);
-  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, ostream *_log=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:

+  ostream* log;
+  infiledesc openFileDesc;

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


@@ -62,11 +79,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