X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9c7beb7e2a457c51a9c4252e8b31b1c9a4ca094..e7c34bc069d13721bf6adfdf000c5fc502cdaf0e:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 464c6dd3b3..1d8f5fcedf 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,6 +7,7 @@ #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" @@ -520,7 +521,7 @@ void SIMIX_comm_finish(smx_activity_t synchro) /* Check out for errors */ if (simcall->issuer->host_->is_off()) { - simcall->issuer->context_->iwannadie = 1; + simcall->issuer->context_->iwannadie = true; simcall->issuer->exception = std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed")); } else { @@ -543,7 +544,7 @@ void SIMIX_comm_finish(smx_activity_t synchro) case SIMIX_SRC_HOST_FAILURE: if (simcall->issuer == comm->src_proc) - simcall->issuer->context_->iwannadie = 1; + simcall->issuer->context_->iwannadie = true; else simcall->issuer->exception = std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); @@ -551,7 +552,7 @@ void SIMIX_comm_finish(smx_activity_t synchro) case SIMIX_DST_HOST_FAILURE: if (simcall->issuer == comm->dst_proc) - simcall->issuer->context_->iwannadie = 1; + simcall->issuer->context_->iwannadie = true; else simcall->issuer->exception = std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); @@ -623,9 +624,8 @@ void SIMIX_comm_finish(smx_activity_t synchro) } } - if (simcall->issuer->host_->is_off()) { - simcall->issuer->context_->iwannadie = 1; - } + if (simcall->issuer->host_->is_off()) + simcall->issuer->context_->iwannadie = true; simcall->issuer->waiting_synchro = nullptr; simcall->issuer->comms.remove(synchro);