implemented concurrent obscache confcache protection.

[phys/latlib.git] / hypercache.cpp

diff --git a/hypercache.cpp b/hypercache.cpp
index 7e0f0e5492864eeca20ea17303c2e3bdb5a9f6aa..16de2a2dcc62db7b86a2bff5dcb000fc1703fdbe 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -4,6 +4,9 @@ configcache *hypercache::O = NULL;
 configcache *hypercache::C = NULL;
 vector<hypercache::para> hypercache::delayedParaAdd;
 vector<hypercache::para> hypercache::delayedParaSet;
 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;

 
 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, 


@@ -14,6 +17,9 @@ void hypercache::initCache(configcache **cache,
   if (O == NULL || C == NULL)
     allInitBefore = false;
 
   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) {
   *cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
 
   if (O != NULL && C != NULL && !allInitBefore) {


@@ -51,6 +57,8 @@ void hypercache::setPara(const string& parid, const double& val) {
   else {
     O->setPara(parid, val);
     C->setPara(parid, val);
   else {
     O->setPara(parid, val);
     C->setPara(parid, val);

+    activeCFile = "";
+    parentConfigs.clear();

   }
 }
 
   }
 }
 


@@ -58,3 +66,50 @@ void hypercache::finalize() {
   delete C;
   delete O;
 }
   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 != "" )
+    O->writeHeader("concurrent_cfile", activeCFile.c_str(), (activeCFile.length()+1)*sizeof(char));
+
+  O->writeConfig(); 
+}
+
+bool hypercache::readO() {
+  bool readret;
+
+  if ( readret = O->readConfig() ) {
+    char *parentconfig = (char*)O->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 )
+      return;
+
+  parentConfigs.push_back(parentconfig);
+}