XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_network, kernel, "Kernel network-related synchronization");
-XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t src, smx_mailbox_t mbox, double task_size,
- double rate, unsigned char* src_buff, size_t src_buff_size,
- bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
- void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t),
- void* data, double timeout)
-{
- simgrid::kernel::activity::ActivityImplPtr comm = simgrid::kernel::activity::CommImpl::isend(
- src, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, false);
- simcall->mc_value_ = 0;
- comm->wait_for(simcall->issuer_, timeout);
-}
-
-XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isend(
- smx_simcall_t /*simcall*/, smx_actor_t src_proc, smx_mailbox_t mbox, double task_size, double rate,
- unsigned char* src_buff, size_t src_buff_size,
- bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
- void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send
- void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), // used to copy data if not default one
- void* data, bool detached)
-{
- return simgrid::kernel::activity::CommImpl::isend(src_proc, mbox, task_size, rate, src_buff, src_buff_size, match_fun,
- clean_fun, copy_data_fun, data, detached);
-}
-
-XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox,
- unsigned char* dst_buff, size_t* dst_buff_size,
- bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
- void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t),
- void* data, double timeout, double rate)
-{
- simgrid::kernel::activity::ActivityImplPtr comm = simgrid::kernel::activity::CommImpl::irecv(
- receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate);
- simcall->mc_value_ = 0;
- comm->wait_for(simcall->issuer_, timeout);
-}
-
-XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr
-simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_mailbox_t mbox, unsigned char* dst_buff,
- size_t* dst_buff_size, bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
- void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data,
- double rate)
-{
- return simgrid::kernel::activity::CommImpl::irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun,
- data, rate);
-}
-
-void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm, double timeout)
-{
- comm->wait_for(simcall->issuer_, timeout);
-}
-
-bool simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm)
-{
- return comm->test(simcall->issuer_);
-}
-
-ssize_t simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count)
-{
- std::vector<simgrid::kernel::activity::ActivityImpl*> comms_vec(comms, comms + count);
- return simgrid::kernel::activity::ActivityImpl::test_any(simcall->issuer_, comms_vec);
-}
-
-void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count,
- double timeout)
-{
- std::vector<simgrid::kernel::activity::CommImpl*> comms_vec(comms, comms + count);
- simgrid::kernel::activity::CommImpl::wait_any_for(simcall->issuer_, comms_vec, timeout);
-}
-
/******************************************************************************/
/* SIMIX_comm_copy_data callbacks */
/******************************************************************************/
}
CommImpl& CommImpl::set_mailbox(MailboxImpl* mbox)
{
+ if (mbox != nullptr)
+ mbox_id_ = mbox->get_id();
mbox_ = mbox;
return *this;
}
copied_ = true;
}
-ActivityImplPtr
-CommImpl::isend(actor::ActorImpl* sender, MailboxImpl* mbox, double task_size, double rate, unsigned char* src_buff,
- size_t src_buff_size, bool (*match_fun)(void*, void*, CommImpl*),
- void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send
- void (*copy_data_fun)(CommImpl*, void*, size_t), // used to copy data if not default one
- void* data, bool detached)
+ActivityImplPtr CommImpl::isend(actor::CommIsendSimcall* observer)
{
+ auto* mbox = observer->get_mailbox();
XBT_DEBUG("send from mailbox %p", mbox);
/* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */
* ourself so that the other side also gets a chance of choosing if it wants to match with us.
*
* If it is not found then push our communication into the rendez-vous point */
- CommImplPtr other_comm = mbox->find_matching_comm(CommImpl::Type::RECEIVE, match_fun, data, this_comm,
- /*done*/ false, /*remove_matching*/ true);
+ CommImplPtr other_comm =
+ mbox->find_matching_comm(CommImpl::Type::RECEIVE, observer->get_match_fun(), observer->get_payload(), this_comm,
+ /*done*/ false, /*remove_matching*/ true);
if (not other_comm) {
other_comm = std::move(this_comm);
other_comm->set_state(State::READY);
}
+ observer->set_comm(other_comm.get());
- if (detached) {
+ if (observer->is_detached()) {
other_comm->detach();
- other_comm->clean_fun = clean_fun;
+ other_comm->clean_fun = observer->get_clean_fun();
} else {
other_comm->clean_fun = nullptr;
- sender->activities_.emplace_back(other_comm);
+ observer->get_issuer()->activities_.emplace_back(other_comm);
}
/* Setup the communication synchro */
- other_comm->src_actor_ = sender;
- other_comm->src_data_ = data;
- (*other_comm).set_src_buff(src_buff, src_buff_size).set_size(task_size).set_rate(rate);
+ other_comm->src_actor_ = observer->get_issuer();
+ other_comm->src_data_ = observer->get_payload();
+ (*other_comm)
+ .set_src_buff(observer->get_src_buff(), observer->get_src_buff_size())
+ .set_size(observer->get_payload_size())
+ .set_rate(observer->get_rate());
- other_comm->match_fun = match_fun;
- other_comm->copy_data_fun = copy_data_fun;
+ other_comm->match_fun = observer->get_match_fun();
+ other_comm->copy_data_fun = observer->get_copy_data_fun();
if (MC_is_active() || MC_record_replay_is_active())
other_comm->set_state(simgrid::kernel::activity::State::RUNNING);
else
other_comm->start();
- if (auto* observer = dynamic_cast<actor::CommIsendSimcall*>(sender->simcall_.observer_)) {
- observer->set_result(detached ? nullptr : other_comm);
- sender->simcall_answer();
- }
-
- return (detached ? nullptr : other_comm);
+ return (observer->is_detached() ? nullptr : other_comm);
}
-ActivityImplPtr CommImpl::irecv(actor::ActorImpl* receiver, MailboxImpl* mbox, unsigned char* dst_buff,
- size_t* dst_buff_size, bool (*match_fun)(void*, void*, CommImpl*),
- void (*copy_data_fun)(CommImpl*, void*, size_t), void* data, double rate)
+ActivityImplPtr CommImpl::irecv(actor::CommIrecvSimcall* observer)
{
CommImplPtr this_synchro(new CommImpl(CommImpl::Type::RECEIVE));
+ auto* mbox = observer->get_mailbox();
XBT_DEBUG("recv from mbox %p. this_synchro=%p", mbox, this_synchro.get());
CommImplPtr other_comm;
if (mbox->is_permanent() && mbox->has_some_done_comm()) {
XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication");
// find a match in the list of already received comms
- other_comm = mbox->find_matching_comm(CommImpl::Type::SEND, match_fun, data, this_synchro, /*done*/ true,
- /*remove_matching*/ true);
+ other_comm = mbox->find_matching_comm(CommImpl::Type::SEND, observer->get_match_fun(), observer->get_payload(),
+ this_synchro, /*done*/ true, /*remove_matching*/ true);
// if not found, assume the receiver came first, register it to the mailbox in the classical way
if (not other_comm) {
XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request "
* ourself so that the other side also gets a chance of choosing if it wants to match with us.
*
* If it is not found then push our communication into the rendez-vous point */
- other_comm = mbox->find_matching_comm(CommImpl::Type::SEND, match_fun, data, this_synchro, /*done*/ false,
- /*remove_matching*/ true);
+ other_comm = mbox->find_matching_comm(CommImpl::Type::SEND, observer->get_match_fun(), observer->get_payload(),
+ this_synchro, /*done*/ false, /*remove_matching*/ true);
if (other_comm == nullptr) {
XBT_DEBUG("Receive pushed first (%zu comm enqueued so far)", mbox->size());
other_comm->set_state(simgrid::kernel::activity::State::READY);
}
- receiver->activities_.emplace_back(other_comm);
+ observer->get_issuer()->activities_.emplace_back(other_comm);
}
+ observer->set_comm(other_comm.get());
/* Setup communication synchro */
- other_comm->dst_actor_ = receiver;
- other_comm->dst_data_ = data;
- other_comm->set_dst_buff(dst_buff, dst_buff_size);
+ other_comm->dst_actor_ = observer->get_issuer();
+ other_comm->dst_data_ = observer->get_payload();
+ other_comm->set_dst_buff(observer->get_dst_buff(), observer->get_dst_buff_size());
- if (rate > -1.0 && (other_comm->get_rate() < 0.0 || rate < other_comm->get_rate()))
- other_comm->set_rate(rate);
+ if (observer->get_rate() > -1.0 && (other_comm->get_rate() < 0.0 || observer->get_rate() < other_comm->get_rate()))
+ other_comm->set_rate(observer->get_rate());
- other_comm->match_fun = match_fun;
- other_comm->copy_data_fun = copy_data_fun;
+ other_comm->match_fun = observer->get_match_fun();
+ other_comm->copy_data_fun = observer->get_copy_data_fun();
if (MC_is_active() || MC_record_replay_is_active()) {
other_comm->set_state(State::RUNNING);
}
other_comm->start();
- if (auto* observer = dynamic_cast<actor::CommIrecvSimcall*>(receiver->simcall_.observer_)) {
- observer->set_result(other_comm);
- receiver->simcall_answer();
- }
-
return other_comm;
}
+
bool CommImpl::test(actor::ActorImpl* issuer)
{
if ((MC_is_active() || MC_record_replay_is_active()) && src_actor_ && dst_actor_)
/* Associate this simcall to the wait synchro */
register_simcall(&issuer->simcall_);
if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = issuer->simcall_.mc_value_;
- if (idx == 0) {
- set_state(State::DONE);
- } else {
- /* If we reached this point, the wait simcall must have a timeout */
- /* Otherwise it shouldn't be enabled and executed by the MC */
- if (timeout < 0.0)
- THROW_IMPOSSIBLE;
- set_state(issuer == src_actor_ ? State::SRC_TIMEOUT : State::DST_TIMEOUT);
- }
+ // FIXME: what about timeouts?
+ set_state(State::DONE);
finish();
return;
}
