X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/510c97d4c651c63ef9851a7e1d9c328f62b5b00b..ad455a31635e6f71bb8dd5c06d85657812c783bd:/include/simgrid/Exception.hpp

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index a6d40e8bae..200eb19cdc 100644
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -78,124 +78,80 @@ public:
       : std::runtime_error(std::move(message)), throwpoint_(std::move(throwpoint))
   {
   }
+  ~Exception(); // DO NOT define it here -- see Exception.cpp for a rationale
 
   /** Return the information about where the exception was thrown */
   xbt::ThrowPoint const& throw_point() const { return throwpoint_; }
 
   std::string const resolve_backtrace() const { return throwpoint_.backtrace_.resolve(); }
 
+  /** Allow to carry a value (used by waitall/waitany) */
+  int value = 0;
+
 private:
   xbt::ThrowPoint throwpoint_;
 };
 
-} // namespace simgrid
-
-/** A legacy exception
- *
- *  It is defined by a category and a value within that category (as well as
- *  an optional error message).
- *
- *  This used to be a structure for C exceptions but it has been retrofitted
- *  as a C++ exception and some of its data has been moved in the
- *  @ref WithContextException base class. We should deprecate it and replace it
- *  with either C++ different exceptions or `std::system_error` which already
- *  provides this (category + error code) logic.
- *  TODO ^^
- *
- *  @ingroup XBT_ex_c
- */
-class XBT_PUBLIC xbt_ex : public simgrid::Exception {
-public:
-  /**
-   *
-   * @param throwpoint Throw point (use XBT_THROW_POINT)
-   * @param message    Exception message
-   */
-  xbt_ex(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : simgrid::Exception(std::move(throwpoint), std::move(message))
-  {
-  }
-
-  xbt_ex(const xbt_ex&) = default;
-
-  ~xbt_ex(); // DO NOT define it here -- see ex.cpp for a rationale
-
-  /** Category (what went wrong) */
-  xbt_errcat_t category = unknown_error;
-
-  /** Why did it went wrong */
-  int value = 0;
-};
-
-namespace simgrid {
-
 /** Exception raised when a timeout elapsed */
-class TimeoutError : public xbt_ex {
+class TimeoutError : public Exception {
 public:
   TimeoutError(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : xbt_ex(std::move(throwpoint), std::move(message))
+      : Exception(std::move(throwpoint), std::move(message))
   {
-    category = timeout_error;
   }
 };
 
 /** Exception raised when a host fails */
-class HostFailureException : public xbt_ex {
+class HostFailureException : public Exception {
 public:
   HostFailureException(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : xbt_ex(std::move(throwpoint), std::move(message))
+      : Exception(std::move(throwpoint), std::move(message))
   {
-    category = host_error;
   }
 };
 
 /** Exception raised when a communication fails because of the network or because of the remote host */
-class NetworkFailureException : public xbt_ex {
+class NetworkFailureException : public Exception {
 public:
   NetworkFailureException(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : xbt_ex(std::move(throwpoint), std::move(message))
+      : Exception(std::move(throwpoint), std::move(message))
   {
-    category = network_error;
   }
 };
 
 /** Exception raised when a storage fails */
-class StorageFailureException : public xbt_ex {
+class StorageFailureException : public Exception {
 public:
   StorageFailureException(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : xbt_ex(std::move(throwpoint), std::move(message))
+      : Exception(std::move(throwpoint), std::move(message))
   {
-    category = io_error;
   }
 };
 
 /** Exception raised when a VM fails */
-class VmFailureException : public xbt_ex {
+class VmFailureException : public Exception {
 public:
   VmFailureException(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : xbt_ex(std::move(throwpoint), std::move(message))
+      : Exception(std::move(throwpoint), std::move(message))
   {
-    category = vm_error;
   }
 };
 
 /** Exception raised when something got canceled before completion */
-class CancelException : public xbt_ex {
+class CancelException : public Exception {
 public:
   CancelException(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : xbt_ex(std::move(throwpoint), std::move(message))
+      : Exception(std::move(throwpoint), std::move(message))
   {
-    category = cancel_error;
   }
 };
 
 /** Exception raised when something is going wrong during the simulation tracing */
-class TracingError : public xbt_ex {
+class TracingError : public Exception {
 public:
   TracingError(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message)
-      : xbt_ex(std::move(throwpoint), std::move(message))
+      : Exception(std::move(throwpoint), std::move(message))
   {
-    category = tracing_error;
   }
 };
 
@@ -239,4 +195,6 @@ private:
 
 } // namespace simgrid
 
+XBT_ATTRIB_DEPRECATED_v327("Please use simgrid::Exception") typedef simgrid::Exception xbt_ex;
+
 #endif