hypercache now working.

diff --git a/.gitignore b/.gitignore
index ec8106299e06d7f39eb9090aec90eb0f2d61cc5e..2a0b23ccb46ebadbab3d06a4535744a4ba398664 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ Makefile
 neigh_test
 cubelooks_test
 culooks_test
 neigh_test
 cubelooks_test
 culooks_test

+hypercache_test

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc7610070d03cf01d48194b8f4c32234a87cdfc2..45b566d73c01aac11a0a8961b35d464e9e27c2af 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,3 +25,6 @@ target_link_libraries(neigh_test lat_neigh)
 
 add_executable(culooks_test culooks_test.cpp)
 target_link_libraries(culooks_test lat_culooks)
 
 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)
\ No newline at end of file

diff --git a/configcache.cpp b/configcache.cpp
index 62b9fdb2ff6a2d9fac9fc76bfd8636b0eb64d303..fe7bd78d486199ebe3970b7a49293d87dd435a5a 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -228,7 +228,8 @@ void configcache::openOutFile()
   time_t secstamp = time(NULL);
 
   outFileName.str("");
   time_t secstamp = time(NULL);
 
   outFileName.str("");

-  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";    
+  outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.edat.tmp";
+

   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
   outBuffer = new boost::iostreams::filtering_ostreambuf;
   outFile.open( outFileName.str().c_str(), std::ios::binary );
 
   outBuffer = new boost::iostreams::filtering_ostreambuf;

diff --git a/hypercache.cpp b/hypercache.cpp
index 8fcc609d909d757b5e95c3cce8bf12991529fc70..7e0f0e5492864eeca20ea17303c2e3bdb5a9f6aa 100644 (file)
--- a/hypercache.cpp
+++ b/hypercache.cpp
@@ -1,10 +1,11 @@
 #include "hypercache.h"
 
 #include "hypercache.h"
 

-hypercache::defaults *hypercache::Defaults = NULL;

 configcache *hypercache::O = NULL;
 configcache *hypercache::C = NULL;
 configcache *hypercache::O = NULL;
 configcache *hypercache::C = NULL;

+vector<hypercache::para> hypercache::delayedParaAdd;
+vector<hypercache::para> hypercache::delayedParaSet;

 
 

-void hypercache::initCache(configcache *cache,
+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) {
   
                           const string& cacheid, const int& nequi, const int& nskip, const string& datadir, 
                           char **configmem, const int& configMemSize, const int& cachemode, writeout *out_a) {
   


@@ -13,15 +14,7 @@ void hypercache::initCache(configcache *cache,
   if (O == NULL || C == NULL)
     allInitBefore = false;
 
   if (O == NULL || C == NULL)
     allInitBefore = false;
 

-  cache = new configcache(cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);
-  
-  if (Defaults == NULL) {
-    Defaults = new defaults;
-    Defaults->nequi = nequi;
-    Defaults->nskip = nskip;
-    Defaults->datadir = datadir;
-    Defaults->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) {
 
   if (O != NULL && C != NULL && !allInitBefore) {
     for (vector<para>::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit) {


@@ -35,17 +28,6 @@ void hypercache::initCache(configcache *cache,
   }
 }
 
   }
 }
 

-void hypercache::initCache(configcache *cache, const string& subdir,
-                          const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode) {
-  if (Defaults == NULL) {
-    cerr << "Defaults were not initialized prior to short initialization!" << endl;
-    exit(1);
-  }
-  
-  initCache(cache, cacheid, Defaults->nequi, Defaults->nskip, Defaults->datadir + "/" + subdir, 
-           configmem, configMemSize, cachemode, Defaults->out);
-}
-

 void hypercache::addPara(const string& parid, const double& val) {
   if (O == NULL || C == NULL) {
     para newpara; 
 void hypercache::addPara(const string& parid, const double& val) {
   if (O == NULL || C == NULL) {
     para newpara; 


@@ -71,3 +53,8 @@ void hypercache::setPara(const string& parid, const double& val) {
     C->setPara(parid, val);
   }
 }
     C->setPara(parid, val);
   }
 }

+
+void hypercache::finalize() {
+  delete C;
+  delete O;
+}

diff --git a/hypercache.h b/hypercache.h
index 53e0f676ceea47c4404268de565af1df32072f71..6997d8221ca81d51e523fe172b69e713097e88d6 100644 (file)
--- a/hypercache.h
+++ b/hypercache.h
@@ -11,18 +11,11 @@ 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) {
  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+"/o", configmem, configMemSize, cachemode, out_a);
+    initCache(&O, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);

   }
   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) {
   }
   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) {

-    initCache(C, cacheid, nequi, nskip, datadir+"/c", configmem, configMemSize, cachemode, out_a);
-  }
-  
-  static void initO(const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL) {
-    initCache(O, "o", cacheid, configmem, configMemSize, cachemode);
-  }
-  static void initC(const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL) {
-    initCache(C, "c", cacheid, configmem, configMemSize, cachemode);
+    initCache(&C, cacheid, nequi, nskip, datadir, configmem, configMemSize, cachemode, out_a);

   }
   
   static void addPara(const string& parid, const double& val=0);
   }
   
   static void addPara(const string& parid, const double& val=0);


@@ -35,29 +28,24 @@ class hypercache {
   static void *getHeaderO(const string& headerid) { O->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); }
   static void *getHeaderO(const string& headerid) { O->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); }

+
+  static void finalize();

   
  private:
   
  private:

-  struct defaults{
-    int nequi;
-    int nskip;
-    string datadir;
-    writeout *out;
-  };

   struct para{
     string parid;
     double val;
   };
 
   struct para{
     string parid;
     double val;
   };
 

-  static void initCache(configcache *cache,
+  static void initCache(configcache **cache,

                        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); 
 
                        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); 
 

-  static void initCache( configcache *cache, const string& subdir,
+  static void initCache( configcache **cache,

                         const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);
                         const string& cacheid, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);

-  
+

   static configcache *O;
   static configcache *C;
   static configcache *O;
   static configcache *C;

-  static defaults *Defaults; 

   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;
 };
   static vector<para> delayedParaAdd;
   static vector<para> delayedParaSet;
 };

diff --git a/hypercache_test.cpp b/hypercache_test.cpp
new file mode 100644 (file)
index 0000000..388ab0a
--- /dev/null
+++ b/hypercache_test.cpp
@@ -0,0 +1,16 @@
+#include "hypercache.h"
+
+#include <string>
+
+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();
+}