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
transparent cleanups around simcalls mechanism
[simgrid.git]
/
src
/
kernel
/
activity
/
CommImpl.cpp
diff --git
a/src/kernel/activity/CommImpl.cpp
b/src/kernel/activity/CommImpl.cpp
index
1410e40
..
28c30e9
100644
(file)
--- a/
src/kernel/activity/CommImpl.cpp
+++ b/
src/kernel/activity/CommImpl.cpp
@@
-26,7
+26,7
@@
XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sr
{
smx_activity_t comm = simcall_HANDLER_comm_isend(simcall, src, mbox, task_size, rate, src_buff, src_buff_size,
match_fun, nullptr, copy_data_fun, data, 0);
- SIMCALL_SET_MC_VALUE(simcall, 0);
+ SIMCALL_SET_MC_VALUE(
*
simcall, 0);
simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
}
@@
-73,7
+73,7
@@
XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(
}
if (detached) {
- other_comm->detach
ed_ = true
;
+ other_comm->detach
()
;
other_comm->clean_fun = clean_fun;
} else {
other_comm->clean_fun = nullptr;
@@
-104,7
+104,7
@@
XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t re
{
smx_activity_t comm = simcall_HANDLER_comm_irecv(simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun,
copy_data_fun, data, rate);
- SIMCALL_SET_MC_VALUE(simcall, 0);
+ SIMCALL_SET_MC_VALUE(
*
simcall, 0);
simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
}
@@
-137,8
+137,7
@@
XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv(
if (other_comm->surf_action_ && other_comm->get_remaining() < 1e-12) {
XBT_DEBUG("comm %p has been already sent, and is finished, destroy it", other_comm.get());
other_comm->state_ = SIMIX_DONE;
- other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::DONE);
- other_comm->mbox = nullptr;
+ other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::DONE).set_mailbox(nullptr);
}
}
} else {
@@
-192,7
+191,7
@@
void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity:
comm->register_simcall(simcall);
if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = SIMCALL_GET_MC_VALUE(simcall);
+ int idx = SIMCALL_GET_MC_VALUE(
*
simcall);
if (idx == 0) {
comm->state_ = SIMIX_DONE;
} else {
@@
-243,7
+242,7
@@
void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity:
comm->simcalls_.push_back(simcall);
comm->finish();
} else {
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer->simcall_answer(
);
}
}
@@
-254,9
+253,9
@@
void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi
simcall_comm_testany__set__result(simcall, -1);
if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = SIMCALL_GET_MC_VALUE(simcall);
+ int idx = SIMCALL_GET_MC_VALUE(
*
simcall);
if (idx == -1) {
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer->simcall_answer(
);
} else {
simgrid::kernel::activity::CommImpl* comm = comms[idx];
simcall_comm_testany__set__result(simcall, idx);
@@
-276,7
+275,7
@@
void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi
return;
}
}
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer->simcall_answer(
);
}
static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall)
@@
-298,7
+297,7
@@
void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi
if (MC_is_active() || MC_record_replay_is_active()) {
if (timeout > 0.0)
xbt_die("Timeout not implemented for waitany in the model-checker");
- int idx = SIMCALL_GET_MC_VALUE(simcall);
+ int idx = SIMCALL_GET_MC_VALUE(
*
simcall);
auto* comm = comms[idx];
comm->simcalls_.push_back(simcall);
simcall_comm_waitany__set__result(simcall, idx);
@@
-308,12
+307,12
@@
void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi
}
if (timeout < 0.0) {
- simcall->time
r
= NULL;
+ simcall->time
out_cb
= NULL;
} else {
- simcall->time
r
= simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() {
+ simcall->time
out_cb
= simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() {
SIMIX_waitany_remove_simcall_from_actions(simcall);
simcall_comm_waitany__set__result(simcall, -1);
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer->simcall_answer(
);
});
}
@@
-340,8
+339,8
@@
void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm,
{
XBT_DEBUG("Copy the data over");
memcpy(comm->dst_buff_, buff, buff_size);
- if (comm->detached
_
) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the
- // original buffer available to the application ASAP
+ if (comm->detached
()
) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the
+
// original buffer available to the application ASAP
xbt_free(buff);
comm->src_buff_ = nullptr;
}
@@
-379,6
+378,11
@@
CommImpl& CommImpl::set_rate(double rate)
rate_ = rate;
return *this;
}
+CommImpl& CommImpl::set_mailbox(MailboxImpl* mbox)
+{
+ mbox_ = mbox;
+ return *this;
+}
CommImpl& CommImpl::set_src_buff(unsigned char* buff, size_t size)
{
@@
-394,6
+398,12
@@
CommImpl& CommImpl::set_dst_buff(unsigned char* buff, size_t* size)
return *this;
}
+CommImpl& CommImpl::detach()
+{
+ detached_ = true;
+ return *this;
+}
+
CommImpl::~CommImpl()
{
XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast<int>(state_), detached_);
@@
-406,8
+416,8
@@
CommImpl::~CommImpl()
if (clean_fun)
clean_fun(src_buff_);
src_buff_ = nullptr;
- } else if (mbox) {
- mbox->remove(this);
+ } else if (mbox
_
) {
+ mbox
_
->remove(this);
}
}
@@
-433,7
+443,7
@@
CommImpl* CommImpl::start()
XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->get_cname(),
receiver->get_cname());
state_ = SIMIX_LINK_FAILURE;
-
cleanupSurf
();
+
post
();
} else if (src_actor_->is_suspended() || dst_actor_->is_suspended()) {
/* If any of the process is suspended, create the synchro but stop its execution,
@@
-459,7
+469,7
@@
void CommImpl::copy_data()
{
size_t buff_size = src_buff_size_;
/* If there is no data to copy then return */
- if (not src_buff_ || not dst_buff_ || copied)
+ if (not src_buff_ || not dst_buff_ || copied
_
)
return;
XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", this,
@@
-483,7
+493,7
@@
void CommImpl::copy_data()
/* Set the copied flag so we copy data only once */
/* (this function might be called from both communication ends) */
- copied = true;
+ copied
_
= true;
}
void CommImpl::suspend()
@@
-507,7
+517,7
@@
void CommImpl::cancel()
/* if the synchro is a waiting state means that it is still in a mbox so remove from it and delete it */
if (state_ == SIMIX_WAITING) {
if (not detached_) {
- mbox->remove(this);
+ mbox
_
->remove(this);
state_ = SIMIX_CANCELED;
}
} else if (not MC_is_active() /* when running the MC there are no surf actions */
@@
-574,9
+584,9
@@
void CommImpl::finish()
continue; // if process handling comm is killed
if (simcall->call == SIMCALL_COMM_WAITANY) {
SIMIX_waitany_remove_simcall_from_actions(simcall);
- if (simcall->time
r
) {
- simcall->time
r
->remove();
- simcall->time
r
= nullptr;
+ if (simcall->time
out_cb
) {
+ simcall->time
out_cb
->remove();
+ simcall->time
out_cb
= nullptr;
}
if (not MC_is_active() && not MC_record_replay_is_active()) {
CommImpl** comms = simcall_comm_waitany__get__comms(simcall);
@@
-588,8
+598,8
@@
void CommImpl::finish()
}
/* If the synchro is still in a rendez-vous point then remove from it */
- if (mbox)
- mbox->remove(this);
+ if (mbox
_
)
+ mbox
_
->remove(this);
XBT_DEBUG("CommImpl::finish(): synchro state = %d", static_cast<int>(state_));
@@
-607,12
+617,12
@@
void CommImpl::finish()
case SIMIX_SRC_TIMEOUT:
simcall->issuer->exception_ = std::make_exception_ptr(
- simgrid::TimeoutE
rror
(XBT_THROW_POINT, "Communication timeouted because of the sender"));
+ simgrid::TimeoutE
xception
(XBT_THROW_POINT, "Communication timeouted because of the sender"));
break;
case SIMIX_DST_TIMEOUT:
simcall->issuer->exception_ = std::make_exception_ptr(
- simgrid::TimeoutE
rror
(XBT_THROW_POINT, "Communication timeouted because of the receiver"));
+ simgrid::TimeoutE
xception
(XBT_THROW_POINT, "Communication timeouted because of the receiver"));
break;
case SIMIX_SRC_HOST_FAILURE:
@@
-681,15
+691,8
@@
void CommImpl::finish()
// In order to modify the exception we have to rethrow it:
try {
std::rethrow_exception(simcall->issuer->exception_);
- } 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 (simgrid::CancelException& e) {
- e.value = rank;
- simcall->issuer->exception_ = std::make_exception_ptr(e);
+ } catch (simgrid::Exception& e) {
+ e.value = rank;
}
}
@@
-709,7
+712,7
@@
void CommImpl::finish()
}
if (simcall->issuer->get_host()->is_on())
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer->simcall_answer(
);
else
simcall->issuer->context_->iwannadie = true;
}