fixed multiple parameter write closing bug.

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 437294684d559e7d652e768a61087cac0040f752..727d1bd325007845bc06bef38b4e0cabcc1a8652 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,24 +24,44 @@ struct parameter{
   double val;
 };
 
   double val;
 };
 

+struct infiledesc {
+  string filename;
+  int nequi;
+  int nskip;
+  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();
-  void writeConfig();
+  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);
+  void writeConfig(int actnequi);

   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);

-  
- private:
+  void writeHeader(const string& headerid, const char *header, long unsigned int size, int actnequi);
+  void * getHeader(const string& headerid);
+  string getOutFileName() { return outFileName.str(); }
+  string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
+  static unsigned long hash(const string& str);
+  void closeInFile() { inFile.close(); }
+  int inFilesLeft() { return inFiles.size(); }
+  char* getConfigMem() { return configMem; }
+  int getConfigSize() { return configSize; }
+  bool isOutFileOpen () { return outFile.is_open(); }

   void finishOutFile();
   void finishOutFile();

+
+ private:
+  ostream* log;
+  infiledesc openFileDesc;

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

-  string getFileId(const bool& shortid=false);
+  string getFileId(int actnequi, const bool& shortid=false);

 
   ofstream outFile;
   ifstream inFile;
 
   ofstream outFile;
   ifstream inFile;


@@ -62,11 +83,33 @@ 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 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);
+
+  int nequileft_internal;
+
+  bool doVirtualEquilibration, firstUsedConfig;

 };
 
 #endif
 };
 
 #endif