X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ba9ddb2180684b3fe1ab8e70b854d3f8558d8dc..04cb8833befbe07b6b94ff0cae98bc17b78724e3:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index dc519f0fe2..ef153ce17a 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -9,7 +9,7 @@ #include -#include +#include "simgrid/s4u/Host.hpp" #include "mc/mc.h" #include "simgrid/s4u/Mailbox.hpp" @@ -17,8 +17,6 @@ #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" @@ -28,16 +26,20 @@ 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::Comm* +_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::Comm* +_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; @@ -50,14 +52,13 @@ static smx_activity_t _find_matching_comm(boost::circular_buffer_space_optimized } 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 || 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 +#if SIMGRID_HAVE_MC comm->mbox_cpy = comm->mbox; #endif comm->mbox = nullptr; @@ -97,42 +98,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::Comm* this_comm = new simgrid::kernel::activity::Comm(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::Comm* 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)); + 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(); + this_comm->unref(); 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; @@ -190,21 +187,20 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * XBT_DEBUG("recv from %p %p", mbox, &mbox->comm_queue); simgrid::kernel::activity::Comm* this_synchro = new simgrid::kernel::activity::Comm(SIMIX_COMM_RECEIVE); - 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::Comm* 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) { XBT_DEBUG("comm %p has been already sent, and is finished, destroy it",other_comm); other_comm->state = SIMIX_DONE; @@ -215,30 +211,29 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * static_cast(this_synchro)->unref(); } } 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); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; } - 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 +246,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, @@ -280,12 +275,12 @@ smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int t 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); @@ -508,7 +503,7 @@ void SIMIX_comm_finish(smx_activity_t synchro) simgrid::kernel::activity::Comm *comm = static_cast(synchro); unsigned int destroy_count = 0; - while (!synchro->simcalls.empty()) { + while (not synchro->simcalls.empty()) { smx_simcall_t simcall = synchro->simcalls.front(); synchro->simcalls.pop_front(); @@ -525,13 +520,13 @@ 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()) + 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(synchro); XBT_DEBUG("SIMIX_comm_finish: synchro state = %d", (int)synchro->state); @@ -633,19 +628,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); + } + //in case of a detached comm we have an extra ref to remove, as the sender won't do it + destroy_count++; } + SIMIX_simcall_answer(simcall); destroy_count++; } @@ -695,7 +695,7 @@ void SIMIX_comm_copy_data(smx_activity_t 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,