From: Alex Schmidt <alex@treefish.org>
Date: Wed, 28 Aug 2013 11:12:20 +0000 (+0200)
Subject: fixed multiple parameter write closing bug.
X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/commitdiff_plain/66dd4bd348bacf6b43b59c2b349a913b722c6504?hp=71a0a66deb80dc52590280b3aa470b970862db93

fixed multiple parameter write closing bug.
---

diff --git a/configcache.cpp b/configcache.cpp
index 62519a4..ef085d8 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -259,7 +259,7 @@ void configcache::readConfig(bool *readnewconfig, int *nequileft, vector<unsigne
 }
 
 void configcache::openOutFile(int actnequi)
-{
+{ 
   time_t secstamp = time(NULL);
 
   outFileName.str("");
@@ -315,6 +315,7 @@ int configcache::getParIndex(const string& parid){
 
 void configcache::setPara(const string& parid, const double& value){
   Paras[getParIndex(parid)].val = value;
+
   finishOutFile();
   if(inBuffer != NULL) { delete inBuffer; inBuffer=NULL; } 
   inFile.close();
diff --git a/hypercache.cpp b/hypercache.cpp
index fd2bbcb..e6864ac 100644
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -6,12 +6,11 @@ vector<hypercache::para> hypercache::delayedParaSet;
 string hypercache::activeCFile = "";
 vector<unsigned long> hypercache::parentConfigs;
 ostream* hypercache::log;
-vector<configcache*> hypercache::Os;
+vector<hypercache::observable> hypercache::Os;
 int hypercache::NEQUI;
 int hypercache::NSKIP;
 int hypercache::nequileft;
 pair<int, char*> hypercache::mostEquilibratedConfig;
-int hypercache::lastWrittenObsEquis;
 
 void hypercache::initCache(configcache **cache,
 			   const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
@@ -40,8 +39,8 @@ void hypercache::addPara(const string& parid, const double& val) {
   if (C != NULL)
     C->addPara(parid, val);
 
-  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
-    (*osit)->addPara(parid, val);
+  for (vector<observable>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    osit->c->addPara(parid, val);
 }
 
 void hypercache::setPara(const string& parid, const double& val) {
@@ -53,16 +52,16 @@ void hypercache::setPara(const string& parid, const double& val) {
   if (C != NULL)
     C->setPara(parid, val);
   
-  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
-    (*osit)->setPara(parid, val);
+  for (vector<observable>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    osit->c->setPara(parid, val);
 
   nequileft = NEQUI;
   mostEquilibratedConfig.first = NEQUI;
 }
 
 void hypercache::finalize() {
-  for (vector<configcache*>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
-    delete *osit;
+  for (vector<observable>::iterator osit = Os.begin(); osit != Os.end(); ++osit)
+    delete osit->c;
   
   delete C;
 }
@@ -143,23 +142,23 @@ void hypercache::writeC() {
 }
 
 void hypercache::writeO(int obsid) {
-  if ( ( lastWrittenObsEquis + NSKIP != NEQUI-nequileft-NSKIP ) && Os[obsid]->isOutFileOpen() )
-    Os[obsid]->finishOutFile();
+  if ( ( Os[obsid].lastWrittenObsEquis + NSKIP != NEQUI-nequileft-NSKIP ) && Os[obsid].c->isOutFileOpen() )
+    Os[obsid].c->finishOutFile();
 
   if ( activeCFile != "" ) {
     unsigned long afilehash = configcache::hash(activeCFile);
-    Os[obsid]->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long), NEQUI-nequileft-NSKIP);
+    Os[obsid].c->writeHeader("concurrent_cfile", (char*)(&afilehash), sizeof(unsigned long), NEQUI-nequileft-NSKIP);
   }
-  Os[obsid]->writeConfig(NEQUI-nequileft-NSKIP); 
+  Os[obsid].c->writeConfig(NEQUI-nequileft-NSKIP); 
 
-  lastWrittenObsEquis = NEQUI-nequileft-NSKIP;
+  Os[obsid].lastWrittenObsEquis = NEQUI-nequileft-NSKIP;
 }
 
 void hypercache::readO(int obsid, bool *readNewObsConfig, int *nequiObsLeft) {
-  Os[obsid]->readConfig(readNewObsConfig, nequiObsLeft);
+  Os[obsid].c->readConfig(readNewObsConfig, nequiObsLeft);
 
   if ( *readNewObsConfig && *nequiObsLeft < 0 ) {
-    unsigned long *parentconfig = (unsigned long*)Os[obsid]->getHeader("concurrent_cfile");
+    unsigned long *parentconfig = (unsigned long*)Os[obsid].c->getHeader("concurrent_cfile");
     if ( parentconfig != NULL )
       addParentConfig(parentconfig);
   }
diff --git a/hypercache.h b/hypercache.h
index c5f548a..1a64373 100644
--- a/hypercache.h
+++ b/hypercache.h
@@ -10,10 +10,20 @@ using namespace std;
 
 class hypercache {
  public:
+  struct observable{
+    configcache *c;
+    int lastWrittenObsEquis;
+  };
+
   static int initO(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) {
-    Os.push_back(NULL);
-    initCache(&Os.back(), cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);
+    observable newobs;
+    
+    newobs.c = NULL;
+    newobs.lastWrittenObsEquis = 0;
+    Os.push_back(newobs);
+
+    initCache(&Os.back().c, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, _log);
     return Os.size()-1;
   }
   static void initC(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
@@ -30,8 +40,8 @@ class hypercache {
   static bool readC();
   static void writeO(int obsid);
   static void writeC();
-  static void writeHeaderO(int obsid, const string& headerid, char *header, long unsigned int size, int actnequi) { Os[obsid]->writeHeader(headerid, header, size, actnequi); }
-  static void *getHeaderO(int obsid, const string& headerid) { Os[obsid]->getHeader(headerid); }
+  static void writeHeaderO(int obsid, const string& headerid, char *header, long unsigned int size, int actnequi) { Os[obsid].c->writeHeader(headerid, header, size, actnequi); }
+  static void *getHeaderO(int obsid, const string& headerid) { Os[obsid].c->getHeader(headerid); }
   static void writeHeaderC(const string& headerid, char *header, long unsigned int size, int actnequi) { C->writeHeader(headerid, header, size, actnequi); }
   static void *getHeaderC(const string& headerid) { C->getHeader(headerid); }
 
@@ -53,7 +63,7 @@ class hypercache {
 			 const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);
 
   static configcache *C;
-  static vector<configcache*> Os;
+  static vector<observable> Os;
   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;
 
@@ -68,8 +78,6 @@ class hypercache {
   static int nequileft;
 
   static pair<int, char*> mostEquilibratedConfig;
-
-  static int lastWrittenObsEquis;
 };
 
 #endif