X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e45e3f28a592f4d456b6a89a8aa8e5e69f595ba1..b6ac23e9dc3754bbad244ed95e7aa386f7be5da6:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 7d0ffebfef..7856a90d19 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -3,6 +3,8 @@ /* 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. */ +#include + #include "src/surf/surf_interface.hpp" #include "src/simix/smx_private.h" #include "xbt/log.h" @@ -84,7 +86,7 @@ void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process) /** * \brief Pushes a communication synchro into a rendez-vous point * \param mbox The mailbox - * \param comm The communication synchro + * \param synchro The communication synchro */ static inline void SIMIX_mbox_push(smx_mailbox_t mbox, smx_synchro_t synchro) { @@ -97,7 +99,7 @@ static inline void SIMIX_mbox_push(smx_mailbox_t mbox, smx_synchro_t synchro) /** * \brief Removes a communication synchro from a rendez-vous point * \param mbox The rendez-vous point - * \param comm The communication synchro + * \param synchro The communication synchro */ void SIMIX_mbox_remove(smx_mailbox_t mbox, smx_synchro_t synchro) { @@ -137,7 +139,7 @@ static smx_synchro_t _find_matching_comm(std::deque *deque, e_smx XBT_DEBUG("Found a matching communication synchro %p", comm); if (remove_matching) deque->erase(it); - comm->refcount++; + comm->ref(); #if HAVE_MC comm->mbox_cpy = comm->mbox; #endif @@ -155,63 +157,7 @@ static smx_synchro_t _find_matching_comm(std::deque *deque, e_smx /******************************************************************************/ /* Communication synchros */ /******************************************************************************/ - -/** - * \brief Destroy a communicate synchro - * \param synchro The communicate synchro to be destroyed - */ -void SIMIX_comm_destroy(smx_synchro_t synchro) -{ - simgrid::simix::Comm *comm = static_cast(synchro); - - XBT_DEBUG("Destroy synchro %p (refcount: %d), state: %d", comm, comm->refcount, (int)comm->state); - - if (comm->refcount <= 0) { - xbt_backtrace_display_current(); - xbt_die("This comm has a negative refcount! You must not call test() or wait() more than once on a given communication."); - } - comm->refcount--; - if (comm->refcount > 0) - return; - XBT_DEBUG("Really free communication %p; refcount is now %d", comm, comm->refcount); - - SIMIX_comm_destroy_internal_actions(synchro); - - if (comm->detached && comm->state != SIMIX_DONE) { - /* the communication has failed and was detached: - * we have to free the buffer */ - if (comm->clean_fun) { - comm->clean_fun(comm->src_buff); - } - comm->src_buff = NULL; - } - - if(comm->mbox) - SIMIX_mbox_remove(comm->mbox, comm); - - delete comm; -} - -void SIMIX_comm_destroy_internal_actions(smx_synchro_t synchro) -{ - simgrid::simix::Comm *comm = static_cast(synchro); - if (comm->surf_comm){ - comm->surf_comm->unref(); - comm->surf_comm = NULL; - } - - if (comm->src_timeout){ - comm->src_timeout->unref(); - comm->src_timeout = NULL; - } - - if (comm->dst_timeout){ - comm->dst_timeout->unref(); - comm->dst_timeout = NULL; - } -} - -void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_mailbox_t mbox, +XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *,smx_synchro_t), @@ -223,7 +169,7 @@ void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_process_t src, smx_mai SIMCALL_SET_MC_VALUE(simcall, 0); simcall_HANDLER_comm_wait(simcall, comm, timeout); } -smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src_proc, smx_mailbox_t mbox, +XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t src_proc, smx_mailbox_t mbox, double task_size, double rate, void *src_buff, size_t src_buff_size, int (*match_fun)(void *, void *,smx_synchro_t), @@ -234,7 +180,7 @@ smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sr XBT_DEBUG("send from %p", mbox); /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */ - smx_synchro_t this_synchro = new simgrid::simix::Comm(SIMIX_COMM_SEND); + simgrid::simix::Comm* this_synchro = new simgrid::simix::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. @@ -253,7 +199,7 @@ smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sr //this mailbox is for small messages, which have to be sent right now other_synchro->state = SIMIX_READY; other_comm->dst_proc=mbox->permanent_receiver; - other_comm->refcount++; + other_comm->ref(); mbox->done_comm_queue->push_back(other_synchro); other_comm->mbox=mbox; XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", mbox, &(other_comm)); @@ -263,8 +209,7 @@ smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sr } } else { XBT_DEBUG("Receive already pushed"); - - SIMIX_comm_destroy(this_synchro); + this_synchro->unref(); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; @@ -272,11 +217,9 @@ smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sr } xbt_fifo_push(src_proc->comms, other_synchro); - /* if the communication synchro is detached then decrease the refcount - * by one, so it will be eliminated by the receiver's destroy call */ + if (detached) { - other_comm->detached = 1; - other_comm->refcount--; + other_comm->detached = true; other_comm->clean_fun = clean_fun; } else { other_comm->clean_fun = NULL; @@ -303,7 +246,7 @@ smx_synchro_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_process_t sr return (detached ? NULL : other_comm); } -void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, +XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), @@ -314,7 +257,7 @@ void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_process_t receiver, sm simcall_HANDLER_comm_wait(simcall, comm, timeout); } -smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, +XBT_PRIVATE smx_synchro_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, int (*match_fun)(void *, void *, smx_synchro_t), void (*copy_data_fun)(smx_synchro_t, void*, size_t), @@ -329,7 +272,7 @@ smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void void *data, double rate) { XBT_DEBUG("recv from %p %p", mbox, mbox->comm_queue); - smx_synchro_t this_synchro = new simgrid::simix::Comm(SIMIX_COMM_RECEIVE); + simgrid::simix::Comm* this_synchro = new simgrid::simix::Comm(SIMIX_COMM_RECEIVE); smx_synchro_t other_synchro; //communication already done, get it inside the fifo of completed comms @@ -352,8 +295,8 @@ smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void other_comm->type = SIMIX_COMM_DONE; other_comm->mbox = NULL; } - other_comm->refcount--; - SIMIX_comm_destroy(this_synchro); + other_comm->unref(); + static_cast(this_synchro)->unref(); } } else { /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */ @@ -369,7 +312,7 @@ smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox, void other_synchro = this_synchro; SIMIX_mbox_push(mbox, this_synchro); } else { - SIMIX_comm_destroy(this_synchro); + this_synchro->unref(); simgrid::simix::Comm *other_comm = static_cast(other_synchro); other_comm->state = SIMIX_READY; @@ -411,44 +354,39 @@ smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_mailbox_t mbox, int int tag, int (*match_fun)(void *, void *, smx_synchro_t), void *data) { XBT_DEBUG("iprobe from %p %p", mbox, mbox->comm_queue); - smx_synchro_t this_synchro; + simgrid::simix::Comm* this_comm; int smx_type; if(type == 1){ - this_synchro = new simgrid::simix::Comm(SIMIX_COMM_SEND); + this_comm = new simgrid::simix::Comm(SIMIX_COMM_SEND); smx_type = SIMIX_COMM_RECEIVE; } else{ - this_synchro = new simgrid::simix::Comm(SIMIX_COMM_RECEIVE); + this_comm = new simgrid::simix::Comm(SIMIX_COMM_RECEIVE); smx_type = SIMIX_COMM_SEND; } smx_synchro_t other_synchro=NULL; if(mbox->permanent_receiver && ! 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_synchro,/*remove_matching*/false); + _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){ 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_synchro,/*remove_matching*/false); + 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) { - simgrid::simix::Comm *other_comm = static_cast(other_synchro); - other_comm->refcount--; - } + if(other_synchro) + other_synchro->unref(); - SIMIX_comm_destroy(this_synchro); + this_comm->unref(); return other_synchro; } void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t synchro, double timeout) { - /* the simcall may be a wait, a send or a recv */ - surf_action_t sleep; - /* Associate this simcall to the wait synchro */ XBT_DEBUG("simcall_HANDLER_comm_wait, %p", synchro); - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); simcall->issuer->waiting_synchro = synchro; if (MC_is_active() || MC_record_replay_is_active()) { @@ -477,7 +415,7 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_synchro_t synchro, dou if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING) { 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 */ - sleep = surf_host_sleep(simcall->issuer->host, timeout); + surf_action_t sleep = surf_host_sleep(simcall->issuer->host, timeout); sleep->setData(synchro); simgrid::simix::Comm *comm = static_cast(synchro); @@ -496,7 +434,7 @@ void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t synchro) simcall_comm_test__set__result(simcall, comm->src_proc && comm->dst_proc); if (simcall_comm_test__get__result(simcall)){ synchro->state = SIMIX_DONE; - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); SIMIX_comm_finish(synchro); } else { SIMIX_simcall_answer(simcall); @@ -506,7 +444,7 @@ void simcall_HANDLER_comm_test(smx_simcall_t simcall, smx_synchro_t synchro) simcall_comm_test__set__result(simcall, (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING)); if (simcall_comm_test__get__result(simcall)) { - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); SIMIX_comm_finish(synchro); } else { SIMIX_simcall_answer(simcall); @@ -526,7 +464,7 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t synchros) }else{ synchro = xbt_dynar_get_as(synchros, idx, smx_synchro_t); simcall_comm_testany__set__result(simcall, idx); - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); synchro->state = SIMIX_DONE; SIMIX_comm_finish(synchro); } @@ -536,7 +474,7 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, xbt_dynar_t synchros) xbt_dynar_foreach(simcall_comm_testany__get__comms(simcall), cursor,synchro) { if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING) { simcall_comm_testany__set__result(simcall, cursor); - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); SIMIX_comm_finish(synchro); return; } @@ -552,7 +490,7 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros) if (MC_is_active() || MC_record_replay_is_active()){ int idx = SIMCALL_GET_MC_VALUE(simcall); synchro = xbt_dynar_get_as(synchros, idx, smx_synchro_t); - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); simcall_comm_waitany__set__result(simcall, idx); synchro->state = SIMIX_DONE; SIMIX_comm_finish(synchro); @@ -561,7 +499,7 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros) xbt_dynar_foreach(synchros, cursor, synchro){ /* associate this simcall to the the synchro */ - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); /* see if the synchro is already finished */ if (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING){ @@ -577,8 +515,12 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) unsigned int cursor = 0; xbt_dynar_t synchros = simcall_comm_waitany__get__comms(simcall); - xbt_dynar_foreach(synchros, cursor, synchro) - xbt_fifo_remove(synchro->simcalls, simcall); + xbt_dynar_foreach(synchros, cursor, synchro) { + // Remove the first occurence of simcall: + auto i = boost::range::find(synchro->simcalls, simcall); + if (i != synchro->simcalls.end()) + synchro->simcalls.erase(i); + } } /** @@ -606,21 +548,18 @@ static inline void SIMIX_comm_start(smx_synchro_t synchro) XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sg_host_get_name(sender), sg_host_get_name(receiver)); comm->state = SIMIX_LINK_FAILURE; - SIMIX_comm_destroy_internal_actions(synchro); + comm->cleanupSurf(); } /* If any of the process is suspend, create the synchro but stop its execution, it will be restarted when the sender process resume */ - if (SIMIX_process_is_suspended(comm->src_proc) || - SIMIX_process_is_suspended(comm->dst_proc)) { - /* FIXME: check what should happen with the synchro state */ - + if (SIMIX_process_is_suspended(comm->src_proc) || SIMIX_process_is_suspended(comm->dst_proc)) { if (SIMIX_process_is_suspended(comm->src_proc)) - XBT_DEBUG("The communication is suspended on startup because src (%s:%s) were suspended since it initiated the communication", - sg_host_get_name(comm->src_proc->host), comm->src_proc->name); + XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the communication", + comm->src_proc->name.c_str(), sg_host_get_name(comm->src_proc->host)); else - XBT_DEBUG("The communication is suspended on startup because dst (%s:%s) were suspended since it initiated the communication", - sg_host_get_name(comm->dst_proc->host), comm->dst_proc->name); + XBT_DEBUG("The communication is suspended on startup because dst (%s@%s) was suspended since it initiated the communication", + comm->dst_proc->name.c_str(), sg_host_get_name(comm->dst_proc->host)); comm->surf_comm->suspend(); } @@ -635,9 +574,10 @@ void SIMIX_comm_finish(smx_synchro_t synchro) { simgrid::simix::Comm *comm = static_cast(synchro); unsigned int destroy_count = 0; - smx_simcall_t simcall; - while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) { + while (!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 @@ -702,7 +642,7 @@ void SIMIX_comm_finish(smx_synchro_t synchro) synchro, comm->src_proc ? sg_host_get_name(comm->src_proc->host) : NULL, comm->dst_proc ? sg_host_get_name(comm->dst_proc->host) : NULL, - simcall->issuer->name, simcall->issuer, comm->detached); + simcall->issuer->name.c_str(), simcall->issuer, comm->detached); if (comm->src_proc == simcall->issuer) { XBT_DEBUG("I'm source"); } else if (comm->dst_proc == simcall->issuer) { @@ -748,6 +688,8 @@ void SIMIX_comm_finish(smx_synchro_t synchro) 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++; } } SIMIX_simcall_answer(simcall); @@ -755,86 +697,7 @@ void SIMIX_comm_finish(smx_synchro_t synchro) } while (destroy_count-- > 0) - SIMIX_comm_destroy(synchro); -} - -/** - * \brief This function is called when a Surf communication synchro is finished. - * \param synchro the corresponding Simix communication - */ -void SIMIX_post_comm(smx_synchro_t synchro) -{ - simgrid::simix::Comm *comm = static_cast(synchro); - - /* Update synchro state */ - if (comm->src_timeout && - comm->src_timeout->getState() == simgrid::surf::Action::State::done) - synchro->state = SIMIX_SRC_TIMEOUT; - else if (comm->dst_timeout && - comm->dst_timeout->getState() == simgrid::surf::Action::State::done) - synchro->state = SIMIX_DST_TIMEOUT; - else if (comm->src_timeout && - comm->src_timeout->getState() == simgrid::surf::Action::State::failed) - synchro->state = SIMIX_SRC_HOST_FAILURE; - else if (comm->dst_timeout && - comm->dst_timeout->getState() == simgrid::surf::Action::State::failed) - synchro->state = SIMIX_DST_HOST_FAILURE; - else if (comm->surf_comm && - comm->surf_comm->getState() == simgrid::surf::Action::State::failed) { - synchro->state = SIMIX_LINK_FAILURE; - } else - synchro->state = SIMIX_DONE; - - XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", - comm, (int)comm->state, comm->src_proc, comm->dst_proc, comm->detached); - - /* destroy the surf actions associated with the Simix communication */ - SIMIX_comm_destroy_internal_actions(comm); - - /* if there are simcalls associated with the synchro, then answer them */ - if (xbt_fifo_size(synchro->simcalls)) { - SIMIX_comm_finish(comm); - } -} - -/************* synchro Getters **************/ - -/** - * \brief Return the user data associated to the sender of the communication - * \param synchro The communication - * \return the user data - */ -void* SIMIX_comm_get_src_data(smx_synchro_t synchro) -{ - simgrid::simix::Comm *comm = static_cast(synchro); - - return comm->src_data; -} - -/** - * \brief Return the user data associated to the receiver of the communication - * \param synchro The communication - * \return the user data - */ -void* SIMIX_comm_get_dst_data(smx_synchro_t synchro) -{ - simgrid::simix::Comm *comm = static_cast(synchro); - - return comm->dst_data; -} - -smx_process_t SIMIX_comm_get_src_proc(smx_synchro_t synchro) -{ - simgrid::simix::Comm *comm = static_cast(synchro); - - return comm->src_proc; -} - -smx_process_t SIMIX_comm_get_dst_proc(smx_synchro_t synchro) -{ - simgrid::simix::Comm *comm = static_cast(synchro); - - return comm->dst_proc; + static_cast(synchro)->unref(); } /******************************************************************************/