X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58205532bf7d35bd624c204dd814916b8e8b2fea..23802cce688def4bcaa49c5723b627b261ca5092:/src/kernel/actor/ActorImpl.cpp

diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index 5d6ddc1eb3..cb929b9ae0 100644
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -318,7 +318,38 @@ void ActorImpl::yield()
     XBT_DEBUG("Wait, maestro left me an exception");
     std::exception_ptr exception = std::move(exception_);
     exception_                   = nullptr;
-    std::rethrow_exception(std::move(exception));
+    try {
+      std::rethrow_exception(std::move(exception));
+    } catch (const simgrid::Exception& e) {
+      if (dynamic_cast<const simgrid::TimeoutException*>(&e) != nullptr) {
+        std::throw_with_nested(simgrid::TimeoutException(XBT_THROW_POINT, "Timeout raised in kernel mode."));
+
+      } else if (dynamic_cast<const simgrid::HostFailureException*>(&e) != nullptr) {
+        std::throw_with_nested(simgrid::HostFailureException(XBT_THROW_POINT, "HostFailure raised in kernel mode."));
+
+      } else if (dynamic_cast<const simgrid::NetworkFailureException*>(&e) != nullptr) {
+        std::throw_with_nested(
+            simgrid::NetworkFailureException(XBT_THROW_POINT, "NetworkFailure raised in kernel mode."));
+
+      } else if (dynamic_cast<const simgrid::StorageFailureException*>(&e) != nullptr) {
+        std::throw_with_nested(
+            simgrid::StorageFailureException(XBT_THROW_POINT, "StorageFailure raised in kernel mode."));
+
+      } else if (dynamic_cast<const simgrid::VmFailureException*>(&e) != nullptr) {
+        std::throw_with_nested(simgrid::VmFailureException(XBT_THROW_POINT, "VmFailure raised in kernel mode."));
+
+      } else if (dynamic_cast<const simgrid::CancelException*>(&e) != nullptr) {
+        std::throw_with_nested(simgrid::CancelException(XBT_THROW_POINT, "Cancel raised in kernel mode."));
+
+      } else if (dynamic_cast<const simgrid::TracingError*>(&e) != nullptr) {
+        std::throw_with_nested(simgrid::TracingError(XBT_THROW_POINT, "Tracing error raised in kernel mode."));
+
+      } else if (dynamic_cast<const simgrid::ParseError*>(&e) != nullptr) {
+        auto pe = dynamic_cast<const simgrid::ParseError*>(&e);
+        std::throw_with_nested(simgrid::ParseError(pe->file_, pe->line_, "Parse error raised in kernel mode."));
+      }
+      THROW_IMPOSSIBLE;
+    }
   }
 
   if (SMPI_switch_data_segment && not finished_) {