A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some useless s/process/actor/ in the source code
[simgrid.git]
/
src
/
simix
/
smx_network.cpp
diff --git
a/src/simix/smx_network.cpp
b/src/simix/smx_network.cpp
index
06f3d27
..
d69d580
100644
(file)
--- a/
src/simix/smx_network.cpp
+++ b/
src/simix/smx_network.cpp
@@
-7,6
+7,7
@@
#include "simgrid/Exception.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/mc/mc_replay.hpp"
#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"
#include "src/simix/smx_private.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
@@
-545,14
+546,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
+571,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
+611,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 {