X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/863aeead864a309c494893a1b06ec33ed2b7daf1..652e6c763d01ad7924087d541928bd44c795d72d:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 1fbcb08dde..6dc0a8ee72 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -27,17 +27,13 @@ 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 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 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 activity if found, nullptr otherwise */ -static simgrid::kernel::activity::CommImpl* +static simgrid::kernel::activity::CommImplPtr _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) @@ -46,19 +42,19 @@ _find_matching_comm(boost::circular_buffer_space_optimized* dequ for(auto it = deque->begin(); it != deque->end(); it++){ smx_activity_t synchro = *it; - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(std::move(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 == nullptr || match_fun(this_user_data, other_user_data, synchro)) && + if (comm->type == type && (match_fun == nullptr || match_fun(this_user_data, other_user_data, comm)) && (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 SIMGRID_HAVE_MC comm->mbox_cpy = comm->mbox; #endif @@ -99,33 +95,31 @@ 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::CommImpl* this_comm = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_SEND); + simgrid::kernel::activity::CommImplPtr this_comm = + simgrid::kernel::activity::CommImplPtr(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 */ - simgrid::kernel::activity::CommImpl* other_comm = + simgrid::kernel::activity::CommImplPtr other_comm = _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_RECEIVE, match_fun, data, this_comm, /*remove_matching*/ true); if (not other_comm) { other_comm = this_comm; - if (mbox->permanent_receiver!=nullptr){ + if (mbox->permanent_receiver != nullptr) { //this mailbox is for small messages, which have to be sent right now other_comm->state = SIMIX_READY; other_comm->dst_proc=mbox->permanent_receiver.get(); - other_comm->ref(); 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{ - mbox->push(this_comm); + mbox->push(other_comm); } } else { XBT_DEBUG("Receive already pushed"); - this_comm->unref(); - this_comm->unref(); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; @@ -185,14 +179,14 @@ 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) { - simgrid::kernel::activity::CommImpl* this_synchro = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE); + simgrid::kernel::activity::CommImplPtr this_synchro = + simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE)); XBT_DEBUG("recv from %p %p. this_synchro=%p", mbox, &mbox->comm_queue, this_synchro); - simgrid::kernel::activity::CommImpl* other_comm; + simgrid::kernel::activity::CommImplPtr other_comm; //communication already done, get it inside the list of completed comms if (mbox->permanent_receiver != nullptr && not mbox->done_comm_queue.empty()) { - this_synchro->unref(); 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 = _find_matching_comm(&mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro, @@ -208,10 +202,7 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * other_comm->state = SIMIX_DONE; other_comm->type = SIMIX_COMM_DONE; other_comm->mbox = nullptr; - other_comm->unref(); } - other_comm->unref(); - this_synchro->unref(); } } else { /* Prepare a comm describing us, so that it gets passed to the user-provided filter of other side */ @@ -230,12 +221,8 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * } else { 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; - this_synchro->unref(); - this_synchro->unref(); } dst_proc->comms.push_back(other_comm); } @@ -272,13 +259,13 @@ 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::CommImpl* this_comm; + simgrid::kernel::activity::CommImplPtr this_comm; int smx_type; if(type == 1){ - this_comm = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_SEND); + this_comm = simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl(SIMIX_COMM_SEND)); smx_type = SIMIX_COMM_RECEIVE; } else{ - this_comm = new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE); + this_comm = simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE)); smx_type = SIMIX_COMM_SEND; } smx_activity_t other_synchro=nullptr; @@ -293,10 +280,6 @@ smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int t (e_smx_comm_type_t) smx_type, match_fun, data, this_comm,/*remove_matching*/false); } - if(other_synchro) - other_synchro->unref(); - - this_comm->unref(); return other_synchro; } @@ -318,7 +301,8 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do if (timeout < 0.0) THROW_IMPOSSIBLE; - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); if (comm->src_proc == simcall->issuer) comm->state = SIMIX_SRC_TIMEOUT; else @@ -335,9 +319,10 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do SIMIX_comm_finish(synchro); } else { /* if (timeout >= 0) { we need a surf sleep action even when there is no timeout, otherwise surf won't tell us when the host fails */ surf_action_t sleep = simcall->issuer->host->pimpl_cpu->sleep(timeout); - sleep->setData(synchro); + sleep->setData(&*synchro); - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); if (simcall->issuer == comm->src_proc) comm->src_timeout = sleep; else @@ -347,7 +332,8 @@ 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::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); if (MC_is_active() || MC_record_replay_is_active()){ simcall_comm_test__set__result(simcall, comm->src_proc && comm->dst_proc); @@ -370,8 +356,8 @@ void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_activity_t synchro) } } -void simcall_HANDLER_comm_testany( - smx_simcall_t simcall, simgrid::kernel::activity::ActivityImpl* comms[], size_t count) +void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::ActivityImplPtr comms[], + size_t count) { // The default result is -1 -- this means, "nothing is ready". // It can be changed below, but only if something matches. @@ -382,7 +368,7 @@ void simcall_HANDLER_comm_testany( if(idx == -1){ SIMIX_simcall_answer(simcall); }else{ - simgrid::kernel::activity::ActivityImpl* synchro = comms[idx]; + simgrid::kernel::activity::ActivityImplPtr synchro = comms[idx]; simcall_comm_testany__set__result(simcall, idx); synchro->simcalls.push_back(simcall); synchro->state = SIMIX_DONE; @@ -392,7 +378,7 @@ void simcall_HANDLER_comm_testany( } for (std::size_t i = 0; i != count; ++i) { - simgrid::kernel::activity::ActivityImpl* synchro = comms[i]; + simgrid::kernel::activity::ActivityImplPtr synchro = comms[i]; if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING) { simcall_comm_testany__set__result(simcall, i); synchro->simcalls.push_back(simcall); @@ -462,7 +448,8 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) */ static inline void SIMIX_comm_start(smx_activity_t synchro) { - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); /* If both the sender and the receiver are already there, start the communication */ if (synchro->state == SIMIX_READY) { @@ -471,7 +458,7 @@ static inline void SIMIX_comm_start(smx_activity_t synchro) simgrid::s4u::Host* receiver = comm->dst_proc->host; comm->surf_comm = surf_network_model->communicate(sender, receiver, comm->task_size, comm->rate); - comm->surf_comm->setData(synchro); + comm->surf_comm->setData(&*synchro); comm->state = SIMIX_RUNNING; XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", synchro, sender->cname(), @@ -508,7 +495,8 @@ static inline void SIMIX_comm_start(smx_activity_t synchro) */ void SIMIX_comm_finish(smx_activity_t synchro) { - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); while (not synchro->simcalls.empty()) { smx_simcall_t simcall = synchro->simcalls.front(); @@ -666,7 +654,8 @@ 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::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_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 +663,8 @@ 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::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); XBT_DEBUG("Copy the data over"); memcpy(comm->dst_buff, buff, buff_size); @@ -690,7 +680,8 @@ void SIMIX_comm_copy_buffer_callback(smx_activity_t synchro, void* buff, size_t */ void SIMIX_comm_copy_data(smx_activity_t synchro) { - simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); size_t buff_size = comm->src_buff_size; /* If there is no data to copy then return */