implement THROW_IMPOSSIBLE and THROW_UNIMPLEMENTED with std::runtime_error directly

[simgrid.git] / include / simgrid / Exception.hpp

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index 454e593..7a2ba1e 100644 (file)
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -11,19 +11,11 @@
  *  Defines all possible exception that could occur in a SimGrid library.
  */
 
-#include <exception>
-#include <stdexcept>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include <xbt/backtrace.h>
 #include <xbt/backtrace.hpp>
-#include <xbt/base.h>
 #include <xbt/ex.h>
-#include <xbt/log.h>
-#include <xbt/misc.h>  // xbt_procname
-#include <xbt/virtu.h> // xbt_getpid
+
+#include <stdexcept>
+#include <string>
 
 namespace simgrid {
 namespace xbt {
@@ -61,7 +53,7 @@ public:
 /** Ancestor class of all SimGrid exception */
 class Exception : public std::runtime_error {
 public:
-  Exception(simgrid::xbt::ThrowPoint throwpoint, const char* message)
+  Exception(simgrid::xbt::ThrowPoint throwpoint, std::string message)
       : std::runtime_error(message), throwpoint_(throwpoint)
   {
   }
@@ -73,22 +65,6 @@ private:
   xbt::ThrowPoint throwpoint_;
 };
 
-/** Exception raised when a timeout elapsed */
-class timeout_error : public simgrid::Exception {
-};
-
-/** Exception raised when an host fails */
-class host_failure : public simgrid::Exception {
-};
-
-/** Exception raised when a communication fails because of the network */
-class network_failure : public simgrid::Exception {
-};
-
-/** Exception raised when something got canceled before completion */
-class canceled_error : public simgrid::Exception {
-};
-
 } // namespace simgrid
 
 /** A legacy exception
@@ -111,7 +87,7 @@ public:
    * @param throwpoint Throw point (use XBT_THROW_POINT)
    * @param message    Exception message
    */
-  xbt_ex(simgrid::xbt::ThrowPoint throwpoint, const char* message) : simgrid::Exception(throwpoint, message) {}
+  xbt_ex(simgrid::xbt::ThrowPoint throwpoint, std::string message) : simgrid::Exception(throwpoint, message) {}
 
   ~xbt_ex(); // DO NOT define it here -- see ex.cpp for a rationale
 
@@ -122,4 +98,34 @@ public:
   int value = 0;
 };
 
+namespace simgrid {
+
+/** Exception raised when a timeout elapsed */
+class TimeoutError : public xbt_ex {
+public:
+  TimeoutError(simgrid::xbt::ThrowPoint throwpoint, std::string message) : xbt_ex(throwpoint, message)
+  {
+    category = timeout_error;
+  }
+};
+
+/** Exception raised when an host fails */
+class HostFailureException : public xbt_ex {
+public:
+  HostFailureException(simgrid::xbt::ThrowPoint throwpoint, std::string message) : xbt_ex(throwpoint, message)
+  {
+    category = host_error;
+  }
+};
+
+/** Exception raised when a communication fails because of the network */
+class NetworkFailureException : public xbt_ex {
+};
+
+/** Exception raised when something got canceled before completion */
+class CancelException : public xbt_ex {
+};
+
+} // namespace simgrid
+
 #endif