X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/fbbe6f07bc8720030541b7319acb02c9233cd622..7f5403eed95da4350dcc03d817eb8468dab07142:/hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index 8fcc609..b025ba6 100644
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -1,10 +1,14 @@
 #include "hypercache.h"
 
-hypercache::defaults *hypercache::Defaults = NULL;
 configcache *hypercache::O = NULL;
 configcache *hypercache::C = NULL;
+vector<hypercache::para> hypercache::delayedParaAdd;
+vector<hypercache::para> hypercache::delayedParaSet;
+string hypercache::activeCFile = "";
+vector<unsigned long> hypercache::parentConfigs;
+writeout *hypercache::out = NULL;
 
-void hypercache::initCache(configcache *cache,
+void hypercache::initCache(configcache **cache,
 			   const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
 			   char **configmem, const int& configMemSize, const int& cachemode, writeout *out_a) {
   
@@ -13,15 +17,10 @@ void hypercache::initCache(configcache *cache,
   if (O == NULL || C == NULL)
     allInitBefore = false;
 
-  cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
-  
-  if (Defaults == NULL) {
-    Defaults = new defaults;
-    Defaults->nequi = nequi;
-    Defaults->nskip = nskip;
-    Defaults->datadir = datadir;
-    Defaults->out = out_a;
-  }
+  if ( out_a != NULL )
+    out = out_a;
+
+  *cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
 
   if (O != NULL && C != NULL && !allInitBefore) {
     for (vector<para>::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit) {
@@ -35,17 +34,6 @@ void hypercache::initCache(configcache *cache,
   }
 }
 
-void hypercache::initCache(configcache *cache, const string& subdir,
-			   const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode) {
-  if (Defaults == NULL) {
-    cerr << "Defaults were not initialized prior to short initialization!" << endl;
-    exit(1);
-  }
-  
-  initCache(cache, cacheid, Defaults->nequi, Defaults->nskip, Defaults->datadir + "/" + subdir, 
-	    configmem, configMemSize, cachemode, Defaults->out);
-}
-
 void hypercache::addPara(const string& parid, const double& val) {
   if (O == NULL || C == NULL) {
     para newpara; 
@@ -69,5 +57,61 @@ void hypercache::setPara(const string& parid, const double& val) {
   else {
     O->setPara(parid, val);
     C->setPara(parid, val);
+    activeCFile = "";
+    parentConfigs.clear();
   }
 }
+
+void hypercache::finalize() {
+  delete C;
+  delete O;
+}
+
+string hypercache::fileOfPath(const string& dressedfile) {
+  return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
+}
+
+bool hypercache::readC() { 
+  bool readret;
+
+  if ( readret = C->readConfig(&parentConfigs) )
+    activeCFile = fileOfPath(C->getInFileName());
+  else
+    activeCFile = "";
+
+  return readret; 
+}
+
+void hypercache::writeC() {
+  C->writeConfig();
+  activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );
+}
+
+void hypercache::writeO() {
+  if ( activeCFile != "" ) {
+    unsigned long afilehash = configcache::hash(activeCFile);
+    O->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long));
+  }
+
+  O->writeConfig(); 
+}
+
+bool hypercache::readO() {
+  bool readret;
+
+  if ( readret = O->readConfig() ) {
+    unsigned long *parentconfig = (unsigned long*)O->getHeader("concurrent_cfile");
+    if ( parentconfig != NULL )
+      addParentConfig(parentconfig);
+  }
+
+  return readret;
+}
+
+void hypercache::addParentConfig(const unsigned long *parentconfig) {
+  for (vector<unsigned long>::iterator parit = parentConfigs.begin(); parit != parentConfigs.end(); ++parit)
+    if ( *parit == *parentconfig )
+      return;
+
+  parentConfigs.push_back(*parentconfig);
+}