Convert all xbt_ex(network_error) throwing locations

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index 1f3d2b3..9ea27ab 100644 (file)
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -121,6 +121,11 @@ public:
 
 /** Exception raised when a communication fails because of the network */
 class NetworkFailureException : public xbt_ex {
 
 /** 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 */
 };
 
 /** Exception raised when something got canceled before completion */

diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp
index 06f3d27..464c6dd 100644 (file)
--- a/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@ -545,14 +545,16 @@ void SIMIX_comm_finish(smx_activity_t synchro)
           if (simcall->issuer == comm->src_proc)
             simcall->issuer->context_->iwannadie = 1;
           else
           if (simcall->issuer == comm->src_proc)
             simcall->issuer->context_->iwannadie = 1;
           else

-            SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed");
+            simcall->issuer->exception =
+                std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));

           break;
 
         case SIMIX_DST_HOST_FAILURE:
           if (simcall->issuer == comm->dst_proc)
             simcall->issuer->context_->iwannadie = 1;
           else
           break;
 
         case SIMIX_DST_HOST_FAILURE:
           if (simcall->issuer == comm->dst_proc)
             simcall->issuer->context_->iwannadie = 1;
           else

-            SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed");
+            simcall->issuer->exception =
+                std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));

           break;
 
         case SIMIX_LINK_FAILURE:
           break;
 
         case SIMIX_LINK_FAILURE:


@@ -568,7 +570,8 @@ void SIMIX_comm_finish(smx_activity_t synchro)
           } else {
             XBT_DEBUG("I'm neither source nor dest");
           }
           } else {
             XBT_DEBUG("I'm neither source nor dest");
           }

-          SMX_EXCEPTION(simcall->issuer, network_error, 0, "Link failure");
+          simcall->issuer->throw_exception(
+              std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Link failure")));

           break;
 
         case SIMIX_CANCELED:
           break;
 
         case SIMIX_CANCELED:


@@ -607,8 +610,11 @@ void SIMIX_comm_finish(smx_activity_t synchro)
       } catch (simgrid::TimeoutError& e) {
         e.value                    = rank;
         simcall->issuer->exception = std::make_exception_ptr(e);
       } catch (simgrid::TimeoutError& e) {
         e.value                    = rank;
         simcall->issuer->exception = std::make_exception_ptr(e);

+      } catch (simgrid::NetworkFailureException& e) {
+        e.value                    = rank;
+        simcall->issuer->exception = std::make_exception_ptr(e);

       } catch (xbt_ex& e) {
       } catch (xbt_ex& e) {

-        if (e.category == network_error || e.category == cancel_error) {
+        if (e.category == cancel_error) {

           e.value                    = rank;
           simcall->issuer->exception = std::make_exception_ptr(e);
         } else {
           e.value                    = rank;
           simcall->issuer->exception = std::make_exception_ptr(e);
         } else {