From: Alexander B. Schmidt <alex@treefish.org>
Date: Sat, 3 Nov 2012 15:52:50 +0000 (+0100)
Subject: ...
X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/commitdiff_plain/d39c90a61334fa4c953842483bb79f3a86d319d0

...
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 017d8d8..e8231bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 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)
 
diff --git a/configcache.cpp b/configcache.cpp
index 3d160a9..b5496c7 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,7 +5,10 @@
 #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;
@@ -102,6 +105,8 @@ bool configcache::readConfig()
 
       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();
 
@@ -114,12 +119,19 @@ bool configcache::readConfig()
 
       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;
 	    }
-	  else inFile.close();
+	  else inFile.close(); 
 	}
     }
 }
diff --git a/configcache.h b/configcache.h
index 4372946..40963e1 100644
--- a/configcache.h
+++ b/configcache.h
@@ -12,6 +12,8 @@
 #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
@@ -26,7 +28,8 @@ struct parameter{
 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);
@@ -45,6 +48,8 @@ class configcache{
   ofstream outFile;
   ifstream inFile;
 
+  writeout *out;
+
   stringstream outFileName;
 
   int readnum;