#include "simgrid/Exception.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_network_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
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
- 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:
} 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:
if (simcall->issuer->exception &&
(simcall->call == SIMCALL_COMM_WAITANY || simcall->call == SIMCALL_COMM_TESTANY)) {
// First retrieve the rank of our failing synchro
- int rank;
+ int rank = -1;
if (simcall->call == SIMCALL_COMM_WAITANY) {
rank = xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &synchro);
} else if (simcall->call == SIMCALL_COMM_TESTANY) {
} 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) {
- 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 {
xbt_die("Unexpected xbt_ex(%s). Please enhance this code", xbt_ex_catname(e.category));
}
}
- catch(...) {
- // Nothing to do
- }
}
if (simcall->issuer->host_->is_off()) {