...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index a3490ad9574337c6ea59d4cee053dead0afb48bf..d45e4d661552340960c5cbb09d9cae4fcd7f23a8 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -10,8 +10,8 @@
 #define HEADER_READLAST 2
 
 configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
 #define HEADER_READLAST 2
 
 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;
+                        ostream *_log){
+  log = _log;

 
   NEQUI = nequi;
   NSKIP = nskip;
 
   NEQUI = nequi;
   NSKIP = nskip;


@@ -131,19 +131,19 @@ int configcache::readHeader()
        return HEADER_READOK;
       }
       else {
        return HEADER_READOK;
       }
       else {

-       if(out) *out->log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush;
+       if(log) *log << "CCACHE: Could not read heade-data! Closing dat-file: " << openFileDesc.filename << endl << flush;

        inFile.close();
        return HEADER_READERR;
       }
     }
     else {
        inFile.close();
        return HEADER_READERR;
       }
     }
     else {

-      if(out) *out->log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush;
+      if(log) *log << "CCACHE: Could not read headerid-hash! Closing dat-file: " << openFileDesc.filename << endl << flush;

       inFile.close();
       return HEADER_READERR;
     }
   }
   else {
       inFile.close();
       return HEADER_READERR;
     }
   }
   else {

-    if(out) *out->log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush;
+    if(log) *log << "CCACHE: Could not read header size. Closing dat-file: " << openFileDesc.filename << endl << flush;

     inFile.close();
     return HEADER_READERR;
   }
     inFile.close();
     return HEADER_READERR;
   }


@@ -201,11 +201,11 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
            }
              
        if ( ! excludethisfile ) {
            }
              
        if ( ! excludethisfile ) {

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

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

-         if(out) *out->log << "CCACHE: Excluded dat-file: " << inFiles.back().filename << endl << flush;
+         if(log) *log << "CCACHE: Excluded dat-file: " << inFiles.back().filename << endl << flush;

        
        inFiles.pop_back();
        
        
        inFiles.pop_back();
        


@@ -219,7 +219,7 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
       if( inFile.is_open() ) 
        {
          if (openFileDesc.doVirtualEquilibration) {
       if( inFile.is_open() ) 
        {
          if (openFileDesc.doVirtualEquilibration) {

-           if(out) *out->log << "CCACHE: Trying virtual equilibration." << endl << flush;
+           if(log) *log << "CCACHE: Trying virtual equilibration." << endl << flush;

            openFileDesc.doVirtualEquilibration = false;
            for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )
            openFileDesc.doVirtualEquilibration = false;
            for (int iskip=0; iskip < (NEQUI-openFileDesc.nequi)/openFileDesc.nskip; iskip++) {
              if( readFullBlock(tmpConfig, configSize) != configSize || ! inFile.is_open() )


@@ -237,7 +237,7 @@ int configcache::readConfig(vector<unsigned long> *excludeFileHashes)
              return -1;
            }
          else {
              return -1;
            }
          else {

-           if(out) *out->log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;
+           if(log) *log << "CCACHE: Could not read configuration. Closing dat-file: " << openFileDesc.filename << endl << flush;

            inFile.close();
          }
        }
            inFile.close();
          }
        }


@@ -350,15 +350,15 @@ int configcache::readDataToMem(char *tmpData, long unsigned int dataSize)
 
   try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
   catch(boost::iostreams::bzip2_error& error) { 
 
   try { readturn = boost::iostreams::read(*inBuffer, tmpData, dataSize); }
   catch(boost::iostreams::bzip2_error& error) { 

-    if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
+    if(log) *log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;

     inFile.close();
   } 
   catch (std::exception const& ex) {
     inFile.close();
   } 
   catch (std::exception const& ex) {

-    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
+    if(log) *log << "CCACHE: Caught exception: " << ex.what() << endl << flush;

     inFile.close();
   }
   catch( ... ) {
     inFile.close();
   }
   catch( ... ) {

-    if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
+    if(log) *log << "CCACHE: Caught unknown exception while reading." << endl << flush;

     inFile.close();
   }
 
     inFile.close();
   }