Convert all xbt_ex(network_error) throwing locations

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

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index 13cbc85..9ea27ab 100644 (file)
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -11,19 +11,12 @@
  *  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 <atomic>
+#include <stdexcept>
+#include <string>
 
 namespace simgrid {
 namespace xbt {
@@ -61,7 +54,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)
   {
   }
@@ -95,7 +88,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
 
@@ -110,19 +103,35 @@ 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 {
+public:
+  NetworkFailureException(simgrid::xbt::ThrowPoint throwpoint, std::string message) : xbt_ex(throwpoint, message)
+  {
+    category = network_error;
+  }
 };
 
 /** Exception raised when something got canceled before completion */
 class CancelException : public xbt_ex {
 };
+
 } // namespace simgrid
 
 #endif