X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9f8f01f1e31a9cec9df207ad241e9c732790cc1..0facf52013684615c801816de974754778c9474a:/src/kernel/activity/CommImpl.cpp diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index c10e7b2375..44dcf48599 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -6,6 +6,7 @@ #include "src/kernel/activity/CommImpl.hpp" #include "simgrid/Exception.hpp" #include "simgrid/kernel/resource/Action.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/modelchecker.h" #include "simgrid/s4u/Host.hpp" #include "src/kernel/activity/MailboxImpl.hpp" @@ -15,7 +16,6 @@ #include "src/surf/network_interface.hpp" #include "src/surf/surf_interface.hpp" -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX 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, @@ -26,7 +26,7 @@ XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sr { simgrid::kernel::activity::ActivityImplPtr comm = simcall_HANDLER_comm_isend( simcall, src, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, false); - SIMCALL_SET_MC_VALUE(*simcall, 0); + simcall->mc_value_ = 0; simcall_HANDLER_comm_wait(simcall, static_cast(comm.get()), timeout); } @@ -41,8 +41,8 @@ XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isen 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 */ - simgrid::kernel::activity::CommImplPtr this_comm(new simgrid::kernel::activity::CommImpl()); - this_comm->set_type(simgrid::kernel::activity::CommImpl::Type::SEND); + simgrid::kernel::activity::CommImplPtr this_comm( + new simgrid::kernel::activity::CommImpl(simgrid::kernel::activity::CommImpl::Type::SEND)); /* Look for communication synchro matching our needs. We also provide a description of * ourself so that the other side also gets a chance of choosing if it wants to match with us. @@ -69,7 +69,6 @@ XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isen XBT_DEBUG("Receive already pushed"); other_comm->state_ = simgrid::kernel::activity::State::READY; - other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY); } if (detached) { @@ -81,8 +80,8 @@ XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isen } /* Setup the communication synchro */ - other_comm->src_actor_ = src_proc; - other_comm->src_data_ = data; + other_comm->src_actor_ = src_proc; + other_comm->src_data_ = data; (*other_comm).set_src_buff(src_buff, src_buff_size).set_size(task_size).set_rate(rate); other_comm->match_fun = match_fun; @@ -104,7 +103,7 @@ XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t re { simgrid::kernel::activity::ActivityImplPtr 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->mc_value_ = 0; simcall_HANDLER_comm_wait(simcall, static_cast(comm.get()), timeout); } @@ -114,8 +113,8 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_ void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double rate) { - simgrid::kernel::activity::CommImplPtr this_synchro(new simgrid::kernel::activity::CommImpl()); - this_synchro->set_type(simgrid::kernel::activity::CommImpl::Type::RECEIVE); + simgrid::kernel::activity::CommImplPtr this_synchro( + new simgrid::kernel::activity::CommImpl(simgrid::kernel::activity::CommImpl::Type::RECEIVE)); XBT_DEBUG("recv from mbox %p. this_synchro=%p", mbox, this_synchro.get()); simgrid::kernel::activity::CommImplPtr other_comm; @@ -136,7 +135,7 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_ 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_ = simgrid::kernel::activity::State::DONE; - other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::DONE).set_mailbox(nullptr); + other_comm->set_mailbox(nullptr); } } } else { @@ -158,14 +157,13 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_ XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_comm.get()); other_comm->state_ = simgrid::kernel::activity::State::READY; - other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY); } receiver->activities_.emplace_back(other_comm); } /* Setup communication synchro */ - other_comm->dst_actor_ = receiver; - other_comm->dst_data_ = data; + other_comm->dst_actor_ = receiver; + other_comm->dst_data_ = data; other_comm->set_dst_buff(dst_buff, dst_buff_size); if (rate > -1.0 && (other_comm->get_rate() < 0.0 || rate < other_comm->get_rate())) @@ -190,7 +188,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->mc_value_; if (idx == 0) { comm->state_ = simgrid::kernel::activity::State::DONE; } else { @@ -254,7 +252,7 @@ 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->mc_value_; if (idx == -1) { simcall->issuer_->simcall_answer(); } else { @@ -285,21 +283,15 @@ static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(simcall); size_t count = simcall_comm_waitany__get__count(simcall); - for (size_t i = 0; i < count; i++) { - // Remove the first occurrence of simcall: - auto* comm = comms[i]; - auto j = boost::range::find(comm->simcalls_, simcall); - if (j != comm->simcalls_.end()) - comm->simcalls_.erase(j); - } + for (size_t i = 0; i < count; i++) + comms[i]->unregister_simcall(simcall); } void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout) { 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); + xbt_assert(timeout <= 0.0, "Timeout not implemented for waitany in the model-checker"); + int idx = simcall->mc_value_; auto* comm = comms[idx]; comm->simcalls_.push_back(simcall); simcall_comm_waitany__set__result(simcall, idx); @@ -336,8 +328,10 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi /******************************************************************************/ /* SIMIX_comm_copy_data callbacks */ /******************************************************************************/ -static void (*SIMIX_comm_copy_data_callback)(simgrid::kernel::activity::CommImpl*, void*, - size_t) = &SIMIX_comm_copy_pointer_callback; +void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t)) +{ + simgrid::kernel::activity::CommImpl::set_copy_data_callback(callback); +} void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { @@ -350,11 +344,6 @@ void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, } } -void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t)) -{ - SIMIX_comm_copy_data_callback = callback; -} - void SIMIX_comm_copy_pointer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { xbt_assert((buff_size == sizeof(void*)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size); @@ -365,10 +354,11 @@ namespace simgrid { namespace kernel { namespace activity { -CommImpl& CommImpl::set_type(CommImpl::Type type) +void (*CommImpl::copy_data_callback_)(CommImpl*, void*, size_t) = &SIMIX_comm_copy_pointer_callback; + +void CommImpl::set_copy_data_callback(void (*callback)(CommImpl*, void*, size_t)) { - type_ = type; - return *this; + copy_data_callback_ = callback; } CommImpl& CommImpl::set_size(double size) @@ -408,11 +398,16 @@ CommImpl& CommImpl::detach() return *this; } +CommImpl::CommImpl(s4u::Host* from, s4u::Host* to, double bytes) : size_(bytes), detached_(true), from_(from), to_(to) +{ + state_ = State::READY; +} + CommImpl::~CommImpl() { - XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast(state_), detached_); + XBT_DEBUG("Really free communication %p in state %s (detached = %d)", this, get_state_str(), detached_); - cleanupSurf(); + cleanup_surf(); if (detached_ && state_ != State::DONE) { /* the communication has failed and was detached: @@ -430,25 +425,31 @@ CommImpl* CommImpl::start() { /* If both the sender and the receiver are already there, start the communication */ if (state_ == State::READY) { - s4u::Host* sender = src_actor_->get_host(); - s4u::Host* receiver = dst_actor_->get_host(); + from_ = from_ != nullptr ? from_ : src_actor_->get_host(); + to_ = to_ != nullptr ? to_ : dst_actor_->get_host(); - surf_action_ = surf_network_model->communicate(sender, receiver, size_, rate_); + /* FIXME[donassolo]: getting the network_model from the origin host + * Soon we need to change this function to first get the routes and later + * create the respective surf actions */ + auto net_model = from_->get_netpoint()->get_englobing_zone()->get_network_model(); + + surf_action_ = net_model->communicate(from_, to_, size_, rate_); surf_action_->set_activity(this); surf_action_->set_category(get_tracing_category()); state_ = State::RUNNING; - XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", this, sender->get_cname(), - receiver->get_cname(), surf_action_); + XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p; state: %s)", this, from_->get_cname(), + to_->get_cname(), surf_action_, get_state_str()); /* If a link is failed, detect it immediately */ if (surf_action_->get_state() == resource::Action::State::FAILED) { - XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->get_cname(), - receiver->get_cname()); + XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", from_->get_cname(), + to_->get_cname()); state_ = State::LINK_FAILURE; post(); - } else if (src_actor_->is_suspended() || dst_actor_->is_suspended()) { + } else if ((src_actor_ != nullptr && src_actor_->is_suspended()) || + (dst_actor_ != nullptr && dst_actor_->is_suspended())) { /* If any of the process is suspended, create the synchro but stop its execution, it will be restarted when the sender process resume */ if (src_actor_->is_suspended()) @@ -480,18 +481,18 @@ void CommImpl::copy_data() dst_actor_ ? dst_actor_->get_host()->get_cname() : "a finished process", dst_buff_, buff_size); /* Copy at most dst_buff_size bytes of the message to receiver's buffer */ - if (dst_buff_size_) - buff_size = std::min(buff_size, *(dst_buff_size_)); + if (dst_buff_size_) { + buff_size = std::min(buff_size, *dst_buff_size_); - /* Update the receiver's buffer size to the copied amount */ - if (dst_buff_size_) + /* Update the receiver's buffer size to the copied amount */ *dst_buff_size_ = buff_size; + } if (buff_size > 0) { if (copy_data_fun) copy_data_fun(this, src_buff_, buff_size); else - SIMIX_comm_copy_data_callback(this, src_buff_, buff_size); + copy_data_callback_(this, src_buff_, buff_size); } /* Set the copied flag so we copy data only once */ @@ -530,7 +531,7 @@ void CommImpl::cancel() } /** @brief This is part of the cleanup process, probably an internal command */ -void CommImpl::cleanupSurf() +void CommImpl::cleanup_surf() { clean_action(); @@ -561,11 +562,11 @@ void CommImpl::post() } else state_ = State::DONE; - XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", this, (int)state_, + XBT_DEBUG("CommImpl::post(): comm %p, state %s, src_proc %p, dst_proc %p, detached: %d", this, get_state_str(), src_actor_.get(), dst_actor_.get(), detached_); /* destroy the surf actions associated with the Simix communication */ - cleanupSurf(); + cleanup_surf(); /* Answer all simcalls associated with the synchro */ finish(); @@ -688,28 +689,21 @@ void CommImpl::finish() } CommImpl** element = std::find(comms, comms + count, this); int rank = (element != comms + count) ? element - comms : -1; - // In order to modify the exception we have to rethrow it: try { std::rethrow_exception(simcall->issuer_->exception_); } catch (simgrid::Exception& e) { - e.value = rank; + e.set_value(rank); } } simcall->issuer_->waiting_synchro_ = nullptr; simcall->issuer_->activities_.remove(this); if (detached_) { - if (simcall->issuer_ == src_actor_) { - if (dst_actor_) - dst_actor_->activities_.remove(this); - } else if (simcall->issuer_ == dst_actor_) { - if (src_actor_) - src_actor_->activities_.remove(this); - } else { + if (simcall->issuer_ != dst_actor_ && dst_actor_ != nullptr) dst_actor_->activities_.remove(this); + if (simcall->issuer_ != src_actor_ && src_actor_ != nullptr) src_actor_->activities_.remove(this); - } } } }