X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ba9ddb2180684b3fe1ab8e70b854d3f8558d8dc..397aa809fd1cb3901b0bf74de3580282e757fddb:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index dc519f0fe2..9ac82e3064 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -7,20 +7,19 @@ #include +#include "src/kernel/activity/CommImpl.hpp" #include -#include +#include "simgrid/s4u/Host.hpp" #include "mc/mc.h" +#include "simgrid/s4u/Activity.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "src/mc/mc_replay.h" #include "src/simix/smx_private.h" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" -#include "xbt/dict.h" -#include "xbt/log.h" -#include "src/kernel/activity/SynchroComm.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); @@ -28,36 +27,39 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related syn static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall); static void SIMIX_comm_copy_data(smx_activity_t comm); static void SIMIX_comm_start(smx_activity_t synchro); -static smx_activity_t _find_matching_comm(boost::circular_buffer_space_optimized *deque, e_smx_comm_type_t type, - int (*match_fun)(void *, void *,smx_activity_t), void *user_data, smx_activity_t my_synchro, bool remove_matching); +static simgrid::kernel::activity::CommImpl* +_find_matching_comm(boost::circular_buffer_space_optimized* deque, e_smx_comm_type_t type, + int (*match_fun)(void*, void*, smx_activity_t), void* user_data, smx_activity_t my_synchro, + bool remove_matching); /** - * \brief Checks if there is a communication synchro queued in a deque matching our needs + * \brief Checks if there is a communication activity queued in a deque matching our needs * \param type The type of communication we are looking for (comm_send, comm_recv) - * \return The communication synchro if found, nullptr otherwise + * \return The communication activity if found, nullptr otherwise */ -static smx_activity_t _find_matching_comm(boost::circular_buffer_space_optimized *deque, e_smx_comm_type_t type, - int (*match_fun)(void *, void *,smx_activity_t), void *this_user_data, smx_activity_t my_synchro, bool remove_matching) +static simgrid::kernel::activity::CommImpl* +_find_matching_comm(boost::circular_buffer_space_optimized* deque, e_smx_comm_type_t type, + int (*match_fun)(void*, void*, smx_activity_t), void* this_user_data, smx_activity_t my_synchro, + bool remove_matching) { void* other_user_data = nullptr; for(auto it = deque->begin(); it != deque->end(); it++){ smx_activity_t synchro = *it; - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); if (comm->type == SIMIX_COMM_SEND) { other_user_data = comm->src_data; } else if (comm->type == SIMIX_COMM_RECEIVE) { other_user_data = comm->dst_data; } - if (comm->type == type && - (! match_fun || match_fun(this_user_data, other_user_data, synchro)) && - (!comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro))) { + if (comm->type == type && (match_fun == nullptr || match_fun(this_user_data, other_user_data, synchro)) && + (not comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro))) { XBT_DEBUG("Found a matching communication synchro %p", comm); if (remove_matching) deque->erase(it); - comm->ref(); -#if HAVE_MC + SIMIX_comm_ref(comm); +#if SIMGRID_HAVE_MC comm->mbox_cpy = comm->mbox; #endif comm->mbox = nullptr; @@ -97,42 +99,38 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx XBT_DEBUG("send from %p", mbox); /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */ - simgrid::kernel::activity::Comm* this_synchro = new simgrid::kernel::activity::Comm(SIMIX_COMM_SEND); + simgrid::kernel::activity::CommImpl* this_comm = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_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. * * If it is not found then push our communication into the rendez-vous point */ - smx_activity_t other_synchro = - _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_RECEIVE, match_fun, data, this_synchro, /*remove_matching*/true); - simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); + simgrid::kernel::activity::CommImpl* other_comm = + _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_RECEIVE, match_fun, data, this_comm, /*remove_matching*/ true); - - if (!other_synchro) { - other_synchro = this_synchro; - other_comm = static_cast(other_synchro); + if (not other_comm) { + other_comm = this_comm; if (mbox->permanent_receiver!=nullptr){ //this mailbox is for small messages, which have to be sent right now - other_synchro->state = SIMIX_READY; + other_comm->state = SIMIX_READY; other_comm->dst_proc=mbox->permanent_receiver.get(); - other_comm->ref(); - mbox->done_comm_queue.push_back(other_synchro); - XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", mbox, &(other_comm)); + other_comm = static_cast(SIMIX_comm_ref(other_comm)); + mbox->done_comm_queue.push_back(other_comm); + XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, &(other_comm)); }else{ - SIMIX_mbox_push(mbox, this_synchro); + mbox->push(this_comm); } } else { XBT_DEBUG("Receive already pushed"); - this_synchro->unref(); + SIMIX_comm_unref(this_comm); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; } - xbt_fifo_push(src_proc->comms, other_synchro); - + src_proc->comms.push_back(other_comm); if (detached) { other_comm->detached = true; @@ -187,58 +185,60 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * void (*copy_data_fun)(smx_activity_t, void*, size_t), // used to copy data if not default one void *data, double rate) { - XBT_DEBUG("recv from %p %p", mbox, &mbox->comm_queue); - simgrid::kernel::activity::Comm* this_synchro = new simgrid::kernel::activity::Comm(SIMIX_COMM_RECEIVE); + simgrid::kernel::activity::CommImpl* this_synchro = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE); + XBT_DEBUG("recv from %p %p. this_synchro=%p", mbox, &mbox->comm_queue, this_synchro); - smx_activity_t other_synchro; - //communication already done, get it inside the fifo of completed comms - if (mbox->permanent_receiver != nullptr && ! mbox->done_comm_queue.empty()) { + simgrid::kernel::activity::CommImpl* other_comm; + //communication already done, get it inside the list of completed comms + if (mbox->permanent_receiver != nullptr && not mbox->done_comm_queue.empty()) { 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 already received fifo - other_synchro = _find_matching_comm(&mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro,/*remove_matching*/true); + //find a match in the list of already received comms + other_comm = _find_matching_comm(&mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro, + /*remove_matching*/ true); //if not found, assume the receiver came first, register it to the mailbox in the classical way - if (!other_synchro) { - XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo"); - other_synchro = this_synchro; - SIMIX_mbox_push(mbox, this_synchro); + if (not other_comm) { + XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into list"); + other_comm = this_synchro; + mbox->push(this_synchro); } else { - simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); - - if(other_comm->surf_comm && other_comm->remains() < 1e-12) { + if (other_comm->surf_comm && other_comm->remains() < 1e-12) { XBT_DEBUG("comm %p has been already sent, and is finished, destroy it",other_comm); other_comm->state = SIMIX_DONE; other_comm->type = SIMIX_COMM_DONE; other_comm->mbox = nullptr; } - other_comm->unref(); - static_cast(this_synchro)->unref(); + SIMIX_comm_unref(other_comm); + SIMIX_comm_unref(this_synchro); } } else { - /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */ + /* Prepare a comm describing us, so that it gets passed to the user-provided filter of other side */ - /* Look for communication synchro matching our needs. We also provide a description of + /* Look for communication activity 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. * * If it is not found then push our communication into the rendez-vous point */ - other_synchro = _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro,/*remove_matching*/true); + other_comm = _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro, + /*remove_matching*/ true); - if (!other_synchro) { + if (not other_comm) { XBT_DEBUG("Receive pushed first %zu", mbox->comm_queue.size()); - other_synchro = this_synchro; - SIMIX_mbox_push(mbox, this_synchro); + other_comm = this_synchro; + mbox->push(this_synchro); } else { - this_synchro->unref(); - simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); + XBT_DEBUG("Match my %p with the existing %p", this_synchro, other_comm); + + other_comm = static_cast(other_comm); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; + SIMIX_comm_unref(this_synchro); + SIMIX_comm_unref(this_synchro); } - xbt_fifo_push(dst_proc->comms, other_synchro); + dst_proc->comms.push_back(other_comm); } /* Setup communication synchro */ - simgrid::kernel::activity::Comm *other_comm = static_cast(other_synchro); other_comm->dst_proc = dst_proc; other_comm->dst_buff = dst_buff; other_comm->dst_buff_size = dst_buff_size; @@ -251,12 +251,12 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * other_comm->copy_data_fun = copy_data_fun; if (MC_is_active() || MC_record_replay_is_active()) { - other_synchro->state = SIMIX_RUNNING; - return other_synchro; + other_comm->state = SIMIX_RUNNING; + return other_comm; } - SIMIX_comm_start(other_synchro); - return other_synchro; + SIMIX_comm_start(other_comm); + return other_comm; } smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, @@ -270,31 +270,31 @@ smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int t int tag, int (*match_fun)(void *, void *, smx_activity_t), void *data) { XBT_DEBUG("iprobe from %p %p", mbox, &mbox->comm_queue); - simgrid::kernel::activity::Comm* this_comm; + simgrid::kernel::activity::CommImpl* this_comm; int smx_type; if(type == 1){ - this_comm = new simgrid::kernel::activity::Comm(SIMIX_COMM_SEND); + this_comm = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_SEND); smx_type = SIMIX_COMM_RECEIVE; } else{ - this_comm = new simgrid::kernel::activity::Comm(SIMIX_COMM_RECEIVE); + this_comm = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE); smx_type = SIMIX_COMM_SEND; } smx_activity_t other_synchro=nullptr; - if (mbox->permanent_receiver != nullptr && !mbox->done_comm_queue.empty()) { + if (mbox->permanent_receiver != nullptr && not mbox->done_comm_queue.empty()) { XBT_DEBUG("first check in the permanent recv mailbox, to see if we already got something"); other_synchro = _find_matching_comm(&mbox->done_comm_queue, (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); } - if (!other_synchro){ + if (not other_synchro) { XBT_DEBUG("check if we have more luck in the normal mailbox"); other_synchro = _find_matching_comm(&mbox->comm_queue, (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); } if(other_synchro) - other_synchro->unref(); + SIMIX_comm_unref(other_synchro); - this_comm->unref(); + SIMIX_comm_unref(this_comm); return other_synchro; } @@ -316,7 +316,7 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do if (timeout < 0.0) THROW_IMPOSSIBLE; - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); if (comm->src_proc == simcall->issuer) comm->state = SIMIX_SRC_TIMEOUT; else @@ -335,7 +335,7 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do surf_action_t sleep = simcall->issuer->host->pimpl_cpu->sleep(timeout); sleep->setData(synchro); - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); if (simcall->issuer == comm->src_proc) comm->src_timeout = sleep; else @@ -345,7 +345,7 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_activity_t synchro) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); if (MC_is_active() || MC_record_replay_is_active()){ simcall_comm_test__set__result(simcall, comm->src_proc && comm->dst_proc); @@ -460,7 +460,7 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) */ static inline void SIMIX_comm_start(smx_activity_t synchro) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); /* If both the sender and the receiver are already there, start the communication */ if (synchro->state == SIMIX_READY) { @@ -468,12 +468,13 @@ static inline void SIMIX_comm_start(smx_activity_t synchro) simgrid::s4u::Host* sender = comm->src_proc->host; simgrid::s4u::Host* receiver = comm->dst_proc->host; - XBT_DEBUG("Starting communication %p from '%s' to '%s'", synchro, sender->cname(), receiver->cname()); - comm->surf_comm = surf_network_model->communicate(sender, receiver, comm->task_size, comm->rate); comm->surf_comm->setData(synchro); comm->state = SIMIX_RUNNING; + XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", synchro, sender->cname(), + receiver->cname(), comm->surf_comm); + /* If a link is failed, detect it immediately */ if (comm->surf_comm->getState() == simgrid::surf::Action::State::failed) { XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->cname(), @@ -505,17 +506,15 @@ static inline void SIMIX_comm_start(smx_activity_t synchro) */ void SIMIX_comm_finish(smx_activity_t synchro) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); - unsigned int destroy_count = 0; + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); - while (!synchro->simcalls.empty()) { + while (not synchro->simcalls.empty()) { smx_simcall_t simcall = synchro->simcalls.front(); synchro->simcalls.pop_front(); - /* If a waitany simcall is waiting for this synchro to finish, then remove - it from the other synchros in the waitany list. Afterwards, get the - position of the actual synchro in the waitany dynar and - return it as the result of the simcall */ + /* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany + * list. Afterwards, get the position of the actual synchro in the waitany dynar and return it as the result of the + * simcall */ if (simcall->call == SIMCALL_NONE) //FIXME: maybe a better way to handle this case continue; // if process handling comm is killed @@ -525,13 +524,14 @@ void SIMIX_comm_finish(smx_activity_t synchro) SIMIX_timer_remove(simcall->timer); simcall->timer = nullptr; } - if (!MC_is_active() && !MC_record_replay_is_active()) - simcall_comm_waitany__set__result(simcall, xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &synchro)); + if (not MC_is_active() && not MC_record_replay_is_active()) + simcall_comm_waitany__set__result(simcall, + xbt_dynar_search(simcall_comm_waitany__get__comms(simcall), &synchro)); } /* If the synchro is still in a rendez-vous point then remove from it */ if (comm->mbox) - SIMIX_mbox_remove(comm->mbox, synchro); + comm->mbox->remove(comm); XBT_DEBUG("SIMIX_comm_finish: synchro state = %d", (int)synchro->state); @@ -541,63 +541,62 @@ void SIMIX_comm_finish(smx_activity_t synchro) simcall->issuer->context->iwannadie = 1; SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); } else { - switch (synchro->state) { - - case SIMIX_DONE: - XBT_DEBUG("Communication %p complete!", synchro); - SIMIX_comm_copy_data(synchro); - break; - - case SIMIX_SRC_TIMEOUT: - SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Communication timeouted because of sender"); - break; - - case SIMIX_DST_TIMEOUT: - SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Communication timeouted because of receiver"); - break; - - case SIMIX_SRC_HOST_FAILURE: - if (simcall->issuer == comm->src_proc) - simcall->issuer->context->iwannadie = 1; - // SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); - else - SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed"); - break; - - case SIMIX_DST_HOST_FAILURE: - if (simcall->issuer == comm->dst_proc) - simcall->issuer->context->iwannadie = 1; - // SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); - else - SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed"); - break; - - case SIMIX_LINK_FAILURE: - - XBT_DEBUG( - "Link failure in synchro %p between '%s' and '%s': posting an exception to the issuer: %s (%p) detached:%d", - synchro, comm->src_proc ? comm->src_proc->host->cname() : nullptr, - comm->dst_proc ? comm->dst_proc->host->cname() : nullptr, simcall->issuer->cname(), simcall->issuer, - comm->detached); - if (comm->src_proc == simcall->issuer) { - XBT_DEBUG("I'm source"); - } else if (comm->dst_proc == simcall->issuer) { - XBT_DEBUG("I'm dest"); - } else { - XBT_DEBUG("I'm neither source nor dest"); - } - SMX_EXCEPTION(simcall->issuer, network_error, 0, "Link failure"); - break; - - case SIMIX_CANCELED: - if (simcall->issuer == comm->dst_proc) - SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Communication canceled by the sender"); - else - SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Communication canceled by the receiver"); - break; - - default: - xbt_die("Unexpected synchro state in SIMIX_comm_finish: %d", (int)synchro->state); + switch (comm->state) { + + case SIMIX_DONE: + XBT_DEBUG("Communication %p complete!", synchro); + SIMIX_comm_copy_data(synchro); + break; + + case SIMIX_SRC_TIMEOUT: + SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Communication timeouted because of sender"); + break; + + case SIMIX_DST_TIMEOUT: + SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Communication timeouted because of receiver"); + break; + + case SIMIX_SRC_HOST_FAILURE: + if (simcall->issuer == comm->src_proc) + simcall->issuer->context->iwannadie = 1; + // SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); + else + SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed"); + break; + + case SIMIX_DST_HOST_FAILURE: + if (simcall->issuer == comm->dst_proc) + simcall->issuer->context->iwannadie = 1; + // SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); + else + SMX_EXCEPTION(simcall->issuer, network_error, 0, "Remote peer failed"); + break; + + case SIMIX_LINK_FAILURE: + XBT_DEBUG("Link failure in synchro %p between '%s' and '%s': posting an exception to the issuer: %s (%p) " + "detached:%d", + synchro, comm->src_proc ? comm->src_proc->host->cname() : nullptr, + comm->dst_proc ? comm->dst_proc->host->cname() : nullptr, simcall->issuer->cname(), simcall->issuer, + comm->detached); + if (comm->src_proc == simcall->issuer) { + XBT_DEBUG("I'm source"); + } else if (comm->dst_proc == simcall->issuer) { + XBT_DEBUG("I'm dest"); + } else { + XBT_DEBUG("I'm neither source nor dest"); + } + SMX_EXCEPTION(simcall->issuer, network_error, 0, "Link failure"); + break; + + case SIMIX_CANCELED: + if (simcall->issuer == comm->dst_proc) + SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Communication canceled by the sender"); + else + SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Communication canceled by the receiver"); + break; + + default: + xbt_die("Unexpected synchro state in SIMIX_comm_finish: %d", (int)synchro->state); } } @@ -633,25 +632,24 @@ void SIMIX_comm_finish(smx_activity_t synchro) } simcall->issuer->waiting_synchro = nullptr; - xbt_fifo_remove(simcall->issuer->comms, synchro); + simcall->issuer->comms.remove(synchro); if(comm->detached){ if(simcall->issuer == comm->src_proc){ if(comm->dst_proc) - xbt_fifo_remove(comm->dst_proc->comms, synchro); + comm->dst_proc->comms.remove(synchro); } - if(simcall->issuer == comm->dst_proc){ + else if(simcall->issuer == comm->dst_proc){ if(comm->src_proc) - xbt_fifo_remove(comm->src_proc->comms, synchro); - //in case of a detached comm we have an extra ref to remove, as the sender won't do it - destroy_count++; + comm->src_proc->comms.remove(synchro); + } + else{ + comm->dst_proc->comms.remove(synchro); + comm->src_proc->comms.remove(synchro); } } + SIMIX_simcall_answer(simcall); - destroy_count++; } - - while (destroy_count-- > 0) - static_cast(synchro)->unref(); } /******************************************************************************/ @@ -666,7 +664,7 @@ void SIMIX_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, void SIMIX_comm_copy_pointer_callback(smx_activity_t synchro, void* buff, size_t buff_size) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); xbt_assert((buff_size == sizeof(void *)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size); *(void **) (comm->dst_buff) = buff; @@ -674,7 +672,7 @@ void SIMIX_comm_copy_pointer_callback(smx_activity_t synchro, void* buff, size_t void SIMIX_comm_copy_buffer_callback(smx_activity_t synchro, void* buff, size_t buff_size) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); XBT_DEBUG("Copy the data over"); memcpy(comm->dst_buff, buff, buff_size); @@ -684,18 +682,17 @@ void SIMIX_comm_copy_buffer_callback(smx_activity_t synchro, void* buff, size_t } } - /** * @brief Copy the communication data from the sender's buffer to the receiver's one * @param synchro The communication */ void SIMIX_comm_copy_data(smx_activity_t synchro) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); size_t buff_size = comm->src_buff_size; /* If there is no data to copy then return */ - if (!comm->src_buff || !comm->dst_buff || comm->copied) + if (not comm->src_buff || not comm->dst_buff || comm->copied) return; XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", comm, @@ -717,8 +714,22 @@ void SIMIX_comm_copy_data(smx_activity_t synchro) SIMIX_comm_copy_data_callback (comm, comm->src_buff, buff_size); } - /* Set the copied flag so we copy data only once */ /* (this function might be called from both communication ends) */ comm->copied = 1; } + +/** Increase the refcount for this comm */ +smx_activity_t SIMIX_comm_ref(smx_activity_t comm) +{ + if (comm != nullptr) + intrusive_ptr_add_ref(comm); + return comm; +} + +/** Decrease the refcount for this comm */ +void SIMIX_comm_unref(smx_activity_t comm) +{ + if (comm != nullptr) + intrusive_ptr_release(comm); +}