...

[phys/latlib.git] / hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index 2d38b2168b1ec70d162fdb1cb767da8dfad46a30..734a640469649d31b8837bed4a7c1a4ccf4a76e6 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -1,70 +1,59 @@
 #include "hypercache.h"
 
 #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<unsigned long> hypercache::parentConfigs;
 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;
+ostream* hypercache::log;
+vector<configcache*> hypercache::Os;

 
 void hypercache::initCache(configcache **cache,
                           const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
 
 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) {
 }
 
 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);
     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) {
 }
 
 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);
     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() {
 }
 
 void hypercache::finalize() {

+  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    delete *osit;
+  

   delete C;
   delete C;

-  delete O;

 }
 
 string hypercache::fileOfPath(const string& dressedfile) {
 }
 
 string hypercache::fileOfPath(const string& dressedfile) {


@@ -89,22 +78,21 @@ void hypercache::writeC() {
   activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );
 }
 
   activeCFile = fileOfPath( C->getOutFileName().substr( 0, C->getOutFileName().length()-4 ) );
 }
 

-void hypercache::writeO() {
+void hypercache::writeO(int obsid) {

   if ( activeCFile != "" ) {
     unsigned long afilehash = configcache::hash(activeCFile);
   if ( activeCFile != "" ) {
     unsigned long afilehash = configcache::hash(activeCFile);

-    O->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long));
+    Os[obsid]->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long));

   }
   }

-
-  O->writeConfig(); 
+  Os[obsid]->writeConfig(); 

 }
 
 }
 

-int hypercache::readO() {
+int hypercache::readO(int obsid) {

   int readret;
 
   int readret;
 

-  readret = O->readConfig();
+  readret = Os[obsid]->readConfig();

 
   if ( readret == -1 ) {
 
   if ( readret == -1 ) {

-    unsigned long *parentconfig = (unsigned long*)O->getHeader("concurrent_cfile");
+    unsigned long *parentconfig = (unsigned long*)Os[obsid]->getHeader("concurrent_cfile");

     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }