X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/b80a3fda9209144605a6306ba24ec2051d387f50..4d1416455c49f0ba19954ca80a72b72f9dfcd33e:/hypercache.cpp?ds=sidebyside

diff --git a/hypercache.cpp b/hypercache.cpp
index 16de2a2..734a640 100644
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -1,80 +1,71 @@
 #include "hypercache.h"
 
-configcache *hypercache::O = NULL;
 configcache *hypercache::C = NULL;
 vector<hypercache::para> hypercache::delayedParaAdd;
 vector<hypercache::para> hypercache::delayedParaSet;
 string hypercache::activeCFile = "";
-vector<string> hypercache::parentConfigs;
-writeout *hypercache::out = NULL;
+vector<unsigned long> hypercache::parentConfigs;
+ostream* hypercache::log;
+vector<configcache*> hypercache::Os;
 
 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) {
+			   char **configmem, const int& configMemSize, const int& cachemode, ostream* _log) {
+  if ( _log != NULL )
+    log = _log;
   
-  bool allInitBefore = true;
+  *cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, log);
   
-  if (O == NULL || C == NULL)
-    allInitBefore = false;
-
-  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) {
-      O->addPara(parit->parid, parit->val);
-      C->addPara(parit->parid, parit->val);
-    }
-    for (vector<para>::iterator parit=delayedParaSet.begin(); parit != delayedParaSet.end(); ++parit) {
-      O->setPara(parit->parid, parit->val);
-      C->setPara(parit->parid, parit->val);
-    }
-  }
+  for (vector<para>::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit)
+    (*cache)->addPara(parit->parid, parit->val);
+
+  for (vector<para>::iterator parit=delayedParaSet.begin(); parit != delayedParaSet.end(); ++parit)
+    (*cache)->setPara(parit->parid, parit->val);
 }
 
 void hypercache::addPara(const string& parid, const double& val) {
-  if (O == NULL || C == NULL) {
-    para newpara; 
-    newpara.parid = parid;
-    newpara.val = val;
-    delayedParaAdd.push_back(newpara);
-  }
-  else {
-    O->addPara(parid, val);
+  para newpara; 
+  newpara.parid = parid;
+  newpara.val = val;
+  delayedParaAdd.push_back(newpara);
+
+  if (C != NULL)
     C->addPara(parid, val);
-  }
+
+  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    (*osit)->addPara(parid, val);
 }
 
 void hypercache::setPara(const string& parid, const double& val) {
-  if (O == NULL || C == NULL) {
-    para newpara; 
-    newpara.parid = parid;
-    newpara.val = val;
-    delayedParaSet.push_back(newpara);
-  }
-  else {
-    O->setPara(parid, val);
+  para newpara; 
+  newpara.parid = parid;
+  newpara.val = val;
+  delayedParaSet.push_back(newpara);
+
+  if (C != NULL)
     C->setPara(parid, val);
-    activeCFile = "";
-    parentConfigs.clear();
-  }
+  
+  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    (*osit)->setPara(parid, val);
 }
 
 void hypercache::finalize() {
+  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    delete *osit;
+  
   delete C;
-  delete O;
 }
 
 string hypercache::fileOfPath(const string& dressedfile) {
   return dressedfile.substr(dressedfile.find_last_of("\\/")+1);
 }
 
-bool hypercache::readC() { 
-  bool readret;
+int hypercache::readC() { 
+  int readret;
 
-  if ( readret = C->readConfig(&parentConfigs) )
+  readret = C->readConfig(&parentConfigs);
+
+  if ( readret == -1 )
     activeCFile = fileOfPath(C->getInFileName());
   else
     activeCFile = "";
@@ -87,29 +78,32 @@ void hypercache::writeC() {
   activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );
 }
 
-void hypercache::writeO() {
-  if ( activeCFile != "" )
-    O->writeHeader("concurrent_cfile", activeCFile.c_str(), (activeCFile.length()+1)*sizeof(char));
-
-  O->writeConfig(); 
+void hypercache::writeO(int obsid) {
+  if ( activeCFile != "" ) {
+    unsigned long afilehash = configcache::hash(activeCFile);
+    Os[obsid]->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long));
+  }
+  Os[obsid]->writeConfig(); 
 }
 
-bool hypercache::readO() {
-  bool readret;
+int hypercache::readO(int obsid) {
+  int readret;
+
+  readret = Os[obsid]->readConfig();
 
-  if ( readret = O->readConfig() ) {
-    char *parentconfig = (char*)O->getHeader("concurrent_cfile");
+  if ( readret == -1 ) {
+    unsigned long *parentconfig = (unsigned long*)Os[obsid]->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }
-
+  
   return readret;
 }
 
-void hypercache::addParentConfig(const char* parentconfig) {
-  for (vector<string>::iterator parit = parentConfigs.begin(); parit != parentConfigs.end(); ++parit)
-    if ( *parit == parentconfig )
+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);
+  parentConfigs.push_back(*parentconfig);
 }