From 22d4f36d4bbd95447a454cceb9084af46927e023 Mon Sep 17 00:00:00 2001 From: Alex Schmidt Date: Wed, 17 Apr 2013 09:37:20 +0200 Subject: [PATCH] made hypercache multi-observable. --- CMakeLists.txt | 3 -- hypercache.cpp | 80 +++++++++++++++++++-------------------------- hypercache.h | 18 +++++----- hypercache_test.cpp | 16 --------- 4 files changed, 44 insertions(+), 73 deletions(-) delete mode 100644 hypercache_test.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index ba307ba..4506e8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,4 @@ target_link_libraries(neigh_test lat_neigh) add_executable(culooks_test culooks_test.cpp) target_link_libraries(culooks_test lat_culooks) -add_executable(hypercache_test hypercache_test.cpp) -target_link_libraries(hypercache_test lat_hypercache) - add_subdirectory(o815) diff --git a/hypercache.cpp b/hypercache.cpp index 2d38b21..6c8e190 100644 --- a/hypercache.cpp +++ b/hypercache.cpp @@ -1,70 +1,59 @@ #include "hypercache.h" -configcache *hypercache::O = NULL; configcache *hypercache::C = NULL; vector hypercache::delayedParaAdd; vector hypercache::delayedParaSet; string hypercache::activeCFile = ""; vector hypercache::parentConfigs; writeout *hypercache::out = NULL; +vector 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) { - - bool allInitBefore = true; - - 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); + + for (vector::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit) + (*cache)->addPara(parit->parid, parit->val); - if (O != NULL && C != NULL && !allInitBefore) { - for (vector::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit) { - O->addPara(parit->parid, parit->val); - C->addPara(parit->parid, parit->val); - } - for (vector::iterator parit=delayedParaSet.begin(); parit != delayedParaSet.end(); ++parit) { - O->setPara(parit->parid, parit->val); - C->setPara(parit->parid, parit->val); - } - } + for (vector::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::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::iterator osit = Os.begin(); osit != Os.end(); ++osit) + (*osit)->setPara(parid, val); } void hypercache::finalize() { + for (vector::iterator osit = Os.begin(); osit != Os.end(); ++osit) + delete *osit; + delete C; - delete O; } string hypercache::fileOfPath(const string& dressedfile) { @@ -89,22 +78,21 @@ void hypercache::writeC() { 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); - 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; - readret = O->readConfig(); + readret = Os[obsid]->readConfig(); 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); } diff --git a/hypercache.h b/hypercache.h index f7c039c..523cc56 100644 --- a/hypercache.h +++ b/hypercache.h @@ -9,9 +9,11 @@ using namespace std; class hypercache { public: - static void initO(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, - char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL) { - initCache(&O, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a); + 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, writeout *out_a=NULL) { + Os.push_back(NULL); + initCache(&Os.back(), cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a); + return Os.size()-1; } static void initC(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL) { @@ -20,12 +22,12 @@ class hypercache { static void addPara(const string& parid, const double& val=0); static void setPara(const string& parid, const double& value); - static int readO(); + static int readO(int obsid); static int readC(); - static void writeO(); + static void writeO(int obsid); static void writeC(); - static void writeHeaderO(const string& headerid, char *header, long unsigned int size) { O->writeHeader(headerid, header, size); } - static void *getHeaderO(const string& headerid) { O->getHeader(headerid); } + static void writeHeaderO(int obsid, const string& headerid, char *header, long unsigned int size) { Os[obsid]->writeHeader(headerid, header, size); } + static void *getHeaderO(int obsid, const string& headerid) { Os[obsid]->getHeader(headerid); } static void writeHeaderC(const string& headerid, char *header, long unsigned int size) { C->writeHeader(headerid, header, size); } static void *getHeaderC(const string& headerid) { C->getHeader(headerid); } @@ -44,8 +46,8 @@ class hypercache { static void initCache( configcache **cache, const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL); - static configcache *O; static configcache *C; + static vector Os; static vector delayedParaAdd; static vector delayedParaSet; static writeout *out; diff --git a/hypercache_test.cpp b/hypercache_test.cpp deleted file mode 100644 index 388ab0a..0000000 --- a/hypercache_test.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "hypercache.h" - -#include - -using namespace std; - -int main() { - char *test; - char *test2; - - hypercache::initO("hallo", 100, 10, "", &test, sizeof(int), CACHE_MODE_READ); - - hypercache::addPara("kappa", 1); - - hypercache::readO(); -} -- 2.39.2