...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 017d8d8718590c317b6b794ae6fa9b7f67d744d4..e8231bf3f67c8331cb96356eef61e15a36be102b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(latlib)
 
 add_library(lat_configcache configcache.cpp)
 project(latlib)
 
 add_library(lat_configcache configcache.cpp)

-target_link_libraries(lat_configcache boost_iostreams)
+target_link_libraries(lat_configcache boost_iostreams lat_writeout)

 
 add_library(lat_neigh neigh.cpp)
 
 
 add_library(lat_neigh neigh.cpp)
 

diff --git a/configcache.cpp b/configcache.cpp
index 3d160a98ad8f22863daae9f1c7ada67c48e2c5e2..b5496c7cb40a38ad4f2d0416eace362203235de6 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,7 +5,10 @@
 #include <time.h>
 #include <dirent.h>
 
 #include <time.h>
 #include <dirent.h>
 

-configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode){
+configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
+                        writeout *out_a){
+  out = out_a;
+

   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;


@@ -102,6 +105,8 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
        {

+         if(out) *out->log << "Opening dat-file: " << inFiles.back() << endl;
+

          inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
          inFiles.pop_back();
 
          inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
          inFiles.pop_back();
 


@@ -114,12 +119,19 @@ bool configcache::readConfig()
 
       if( inFile.is_open() ) 
        {
 
       if( inFile.is_open() ) 
        {

-         if( boost::iostreams::read(*inBuffer, tmpConfig, configSize) == configSize )
+         int readturn = -1;
+         try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+         catch (std::exception const& ex) {
+           if(out) *out->log << "Caught exception: " << ex.what() << endl;
+           inFile.close();
+         }
+         
+         if( readturn == configSize && inFile.is_open() )

            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }
            {
              memcpy(configMem, tmpConfig, configSize);
              return true;
            }

-         else inFile.close();
+         else inFile.close(); 

        }
     }
 }
        }
     }
 }

diff --git a/configcache.h b/configcache.h
index 437294684d559e7d652e768a61087cac0040f752..40963e1d0be3e67f4e411d2c4af93b8460a20dd4 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -12,6 +12,8 @@
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 

+#include "writeout.h"
+

 #define CACHE_MODE_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2
 #define CACHE_MODE_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2


@@ -26,7 +28,8 @@ struct parameter{
 class configcache{
  public:
   ~configcache();
 class configcache{
  public:
   ~configcache();

-  configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode=CACHE_MODE_FULL);
+  configcache(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);

   bool readConfig();
   void writeConfig();
   void addPara(const string& parid, const double& val=0);
   bool readConfig();
   void writeConfig();
   void addPara(const string& parid, const double& val=0);


@@ -45,6 +48,8 @@ class configcache{
   ofstream outFile;
   ifstream inFile;
 
   ofstream outFile;
   ifstream inFile;
 

+  writeout *out;
+

   stringstream outFileName;
 
   int readnum;
   stringstream outFileName;
 
   int readnum;