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 e09cde0..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 {
@@ -110,6 +103,11 @@ 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 */
@@ -123,11 +121,17 @@ public:
 
 /** 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