Changeset 280 in pacpusframework for trunk

Timestamp:

Mar 20, 2014, 11:59:05 AM (11 years ago)

Author:

Marek Kurdej

Message:

Major: DbiteException uses boost::exception.

Location:

trunk

Files:

• include/Pacpus/kernel/DbiteException.h (modified) (3 diffs)
• include/Pacpus/kernel/PacpusException.h (modified) (2 diffs)
• src/FileLib/src/DbiteException.cpp (modified) (1 diff)
• src/FileLib/src/DbiteFile.cpp (modified) (21 diffs)
• src/PacpusLib/ComponentBase.cpp (modified) (1 diff)
• src/PacpusLib/PacpusApplication.cpp (modified) (2 diffs)
• src/PacpusLib/PacpusException.cpp (modified) (1 diff)
• src/PacpusLib/XmlConfigFile.cpp (modified) (2 diffs)

trunk/include/Pacpus/kernel/DbiteException.h

@@ -18 +18 @@
 #include <Pacpus/kernel/PacpusException.h>
 
+#include <ios>
 #include <string>
 
@@ -29 +30 @@
     /// Ctor.
     /// @param what Information about the exception.
-    DbiteException(const std::string & what);
+    DbiteException(std::string const& what = "");
 
     /// Dtor.
@@ -35 +36 @@
 };
 
+typedef boost::error_info<struct tag_errinfo_ios_base_open_mode, std::ios_base::openmode> errinfo_ios_base_open_mode;
+
 } // namespace pacpus
 

trunk/include/Pacpus/kernel/PacpusException.h

@@ -17 +17 @@
 #include <Pacpus/kernel/PacpusLibConfig.h>
 
-//#include <boost/exception/exception.hpp>
+#include <boost/exception/exception.hpp>
+#include <boost/exception/error_info.hpp>
 #include <exception>
 #include <string>
@@ -23 +24 @@
 #ifdef _MSC_VER
 #   pragma warning(push)
-#   pragma warning(disable: 4251)
+#   pragma warning(disable: 4251 4275)
 #endif // _MSC_VER
 
-namespace pacpus {
+namespace pacpus
+{
 
 /// Base class for all exceptions in the framework
 class PACPUSLIB_API PacpusException
-    : virtual public std::exception
-    //, virtual public boost::exception
+    : /*virtual*/ public std::runtime_error
+    , virtual public boost::exception
 {
 public:
     /// Ctor.
     /// @param what Information about the exception.
-    PacpusException(const std::string & what);
+    PacpusException(std::string const& what = "");
 
     /// Dtor.
-    virtual ~PacpusException() throw();
-
-    /// Gets more information about the error.
-    ///
-    /// @returns Message containing information about the error.
-    virtual const char * what() const throw();
-
-protected:
-    std::string mWhat;
+    virtual ~PacpusException();
 };
 
 } // namespace pacpus
+
+typedef boost::error_info<struct tag_errinfo_signal, int> errinfo_signal;
 
 #ifdef _MSC_VER

trunk/src/FileLib/src/DbiteException.cpp

@@ -10 +10 @@
 using namespace pacpus;
 
-DbiteException::DbiteException(const std::string& what)
+DbiteException::DbiteException(std::string const& what)
     : PacpusException(what)
 {

trunk/src/FileLib/src/DbiteFile.cpp

@@ -10 +10 @@
 #include <Pacpus/kernel/Log.h>
 
+#include <boost/exception/detail/exception_ptr.hpp>
+#include <boost/exception/errinfo_api_function.hpp>
+#include <boost/exception/errinfo_file_name.hpp>
+#include <boost/exception/errinfo_nested_exception.hpp>
 #include <cassert>
 #include <cmath>
@@ -16 +20 @@
 #include <sstream>
 
+using boost::copy_exception;
+using boost::errinfo_api_function;
+using boost::errinfo_file_name;
+using boost::errinfo_nested_exception;
+using boost::exception_ptr;
 using namespace pacpus;
-using namespace std;
+using std::fstream;
+using std::ios_base;
+using std::min;
+using std::max;
+using std::numeric_limits;
+using std::streamsize;
+using std::string;
+using std::stringstream;
 
 // FIXME: record size is only 8-bit long!
@@ -32 +48 @@
 }
 
-bool doesFileExist(const string & path);
+bool doesFileExist(string const& path);
 
 DbiteFile::DbiteFile()
@@ -57 +73 @@
     stringstream os;
 
-    os << "Signature    : " << getSignature() << endl;
-    os << "Version      : " << getVersion() << endl;
-    os << "Header size  : " << getDataOffset() << " [bytes]" << endl;
-    os << "Record size  : " << getRecordSize() << " [bytes]" << endl;
-    os << "Data type    : " << getType() << endl;
-    os << "Time min.    : " << getTimeMin() << endl;
-    os << "Time max.    : " << getTimeMax() << endl;
-    os << "Duration     : " << (getTimeMax() - getTimeMin()) / kMicrosInSecond << " [seconds]" << endl;
-    os << "File size    : " << getFileSize() << " [bytes]" << endl;
-    os << "Record count : " << getRecordCount() << endl;
+    os << "Signature    : " << getSignature() << "\n";
+    os << "Version      : " << getVersion() << "\n";
+    os << "Header size  : " << getDataOffset() << " [bytes]" << "\n";
+    os << "Record size  : " << getRecordSize() << " [bytes]" << "\n";
+    os << "Data type    : " << getType() << "\n";
+    os << "Time min.    : " << getTimeMin() << "\n";
+    os << "Time max.    : " << getTimeMax() << "\n";
+    os << "Duration     : " << (getTimeMax() - getTimeMin()) / kMicrosInSecond << " [seconds]" << "\n";
+    os << "File size    : " << getFileSize() << " [bytes]" << "\n";
+    os << "Record count : " << getRecordCount() << "\n";
 
     return os.str();
@@ -91 +107 @@
     setPath(path);
 
-    mFile.open(getPath().c_str(), ios_base::binary | ios_base::in);
+    ios_base::openmode openmode = ios_base::binary | ios_base::in;
+    mFile.open(getPath().c_str(), openmode);
     try {
         checkFileOpen();
@@ -98 +115 @@
         LOG_ERROR("Dbite exception: " << e.what());
         close();
-        throw DbiteException("cannot open file for reading");
+        BOOST_THROW_EXCEPTION(DbiteException("cannot open file for reading")
+            << errinfo_file_name(mPath)
+            << errinfo_ios_base_open_mode(openmode)
+        );
     }
 
     try {
         readHeader();
-    } catch (DbiteException & e) {
+    } catch (DbiteException& e) {
         (void) e; // unused
         LOG_ERROR("Dbite exception: " << e.what());
         // TODO: readAndDiagnoseHeader();
         close();
-        throw DbiteException("cannot read header");
+        BOOST_THROW_EXCEPTION(DbiteException("cannot read header")
+            << errinfo_nested_exception(copy_exception(e))
+        );
     }
     verifyHeader();
@@ -156 +178 @@
     if (!isOpen()) {
         LOG_ERROR("cannot open file for writing");
-        throw DbiteException("cannot open file for writing");
+        BOOST_THROW_EXCEPTION(DbiteException("cannot open file for writing")
+            << errinfo_ios_base_open_mode(openmode)
+        );
     }
 
@@ -170 +194 @@
             // TODO: readAndDiagnoseHeader();
             close();
-            throw DbiteException("cannot read header");
+            BOOST_THROW_EXCEPTION(DbiteException("cannot read header"));
         }
     } else {
@@ -336 +360 @@
     if (getVersion() != VERSION_NUMBER) {
         LOG_ERROR("bad version number");
-        throw DbiteException("bad version number");
+        BOOST_THROW_EXCEPTION(DbiteException("bad version number"));
     }
 
     if (!isSignatureCorrect()) {
         LOG_ERROR("bad signature");
-        throw DbiteException("bad signature");
+        BOOST_THROW_EXCEPTION(DbiteException("bad signature"));
     }
 
@@ -511 +535 @@
     if (isVariableDataSize()) {
         LOG_ERROR("cannot read nth record in a variable");
-        throw DbiteException("cannot read nth record in a variable");
+        BOOST_THROW_EXCEPTION(DbiteException("cannot read nth record in a variable"));
     }
 
@@ -518 +542 @@
     if (getFileSize() < nthRecordPosition) {
         LOG_WARN("wanted to read past the file end");
-        //throw DbiteException("wanted to read past the file end");
+        //BOOST_THROW_EXCEPTION(DbiteException("wanted to read past the file end"));
     }
     mFile.clear();
@@ -530 +554 @@
     if (!buffer) {
         LOG_WARN("data buffer must be a non-NULL pointer");
-        throw DbiteException("data buffer must be a non-NULL pointer");
+        BOOST_THROW_EXCEPTION(DbiteException("data buffer must be a non-NULL pointer"));
     }
 
@@ -582 +606 @@
         }
         LOG_ERROR("cannot read acquisition time");
-        throw DbiteException("cannot read acquisition time");
+        BOOST_THROW_EXCEPTION(DbiteException("cannot read acquisition time")
+            << errinfo_file_name(mPath)
+            << errinfo_api_function("read")
+        );
     }
 
@@ -613 +640 @@
             LOG_INFO("buffer size = " << bufferSize);
             LOG_INFO("data   size = " << dataSize);
-            throw DbiteException("buffer is smaller than the data size");
+            BOOST_THROW_EXCEPTION(DbiteException("buffer is smaller than the data size"));
             // TODO: don't throw exception, but read only as much data as possible
         }
@@ -682 +709 @@
         // read forward
         readResult = readRecordForward(time, timeRange, buffer, bufferSize);
-    } catch (DbiteException & e) {
+    } catch (DbiteException& /*e*/) {
         setReadPosition(initialPosition);
-        throw e;
+        throw;
     }
 
@@ -703 +730 @@
         if (dataSize > static_cast<size_t>(numeric_limits<VariableDataSizeT>::max())) {
             LOG_ERROR("variable data size too big");
-            throw DbiteException("variable data size too big");
+            BOOST_THROW_EXCEPTION(DbiteException("variable data size too big")
+                << errinfo_file_name(mPath)
+            );
         }
     }
@@ -734 +763 @@
             writtenBytes += sizeof(VariableDataSizeT);
         }
-    } catch (DbiteException & e) {
+    } catch (DbiteException& e) {
         LOG_ERROR("Dbite exception: " << e.what());
         LOG_INFO("restoring initial write position");
@@ -740 +769 @@
         // on error, go back to record start
         setWritePosition(- (int64_t) writtenBytes, ios_base::cur);
-        throw e;
+        throw;
     }
  
@@ -766 +795 @@
     if (!mFile) {
         LOG_ERROR("cannot read data");
-        throw DbiteException("cannot read data");
+        BOOST_THROW_EXCEPTION(DbiteException("cannot read data")
+            << errinfo_file_name(mPath)
+            << errinfo_api_function("read")
+        );
     }
 }
@@ -775 +807 @@
     if (!mFile) {
         LOG_ERROR("cannot write data");
-        throw DbiteException("cannot write data");
+        BOOST_THROW_EXCEPTION(DbiteException("cannot write data")
+            << errinfo_file_name(mPath)
+            << errinfo_api_function("write")
+        );
     }
 }
@@ -789 +824 @@
         string errorMessage = "file is not open";
         LOG_WARN(errorMessage);
-        throw DbiteException(errorMessage.c_str());
+        BOOST_THROW_EXCEPTION(DbiteException(errorMessage.c_str())
+            << errinfo_file_name(mPath)
+        );
     }
 }

trunk/src/PacpusLib/ComponentBase.cpp

@@ -509 +509 @@
     } catch (po::error& e) {
         LOG_WARN(e.what());
-        throw PacpusException(e.what());
+        BOOST_THROW_EXCEPTION(PacpusException(e.what()));
     }
 

trunk/src/PacpusLib/PacpusApplication.cpp

@@ -89 +89 @@
     try {
         return QApplication::notify(receiver, ev);
-    } catch (PacpusException & e) {
+    } catch (PacpusException& e) {
         (void)e; // unused
-        LOG_ERROR("PacpusException thrown:" << e.what());
-    } catch (boost::exception & e) {
+        LOG_ERROR("PacpusException thrown:" << e.what() << "\n" << boost::diagnostic_information(e));
+    } catch (boost::exception& e) {
         (void)e; // unused
         LOG_ERROR("boost::exception thrown:" << boost::diagnostic_information(e));
-    } catch (std::exception & e) {
+    } catch (std::exception& e) {
         (void)e; // unused
         LOG_ERROR("std::exception thrown:" << e.what());
@@ -125 +125 @@
     std::stringstream errorMessage;
     errorMessage << "received signal number " << signal;
-    throw PacpusException(errorMessage.str());
+    BOOST_THROW_EXCEPTION(PacpusException(errorMessage.str())
+        << errinfo_signal(signal)
+    );
 }

trunk/src/PacpusLib/PacpusException.cpp

@@ -10 +10 @@
 using namespace pacpus;
 
-PacpusException::PacpusException(const std::string & what)
-    : mWhat(what)
+PacpusException::PacpusException(std::string const& what)
+    : std::runtime_error(what)
 {
 }
 
-PacpusException::~PacpusException() throw()
+PacpusException::~PacpusException()
 {
 }
-
-const char * PacpusException::what() const throw()
-{
-    return mWhat.c_str();
-}

trunk/src/PacpusLib/XmlConfigFile.cpp

@@ -8 +8 @@
 
 #include <Pacpus/kernel/Log.h>
+#include <Pacpus/kernel/PacpusException.h>
 
 #include <cassert>
@@ -67 +68 @@
     } else {
         LOG_ERROR("cannot open XML document " << kXmlConfigFilename);
-        throw "cannot open XML document file";
+        BOOST_THROW_EXCEPTION(PacpusException("cannot open XML document file"));
     }
 }