X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e4039652526033642b167e65ad9c1e34fdd6c43..1fb2f54c35266af4042c56102ec1ad27e2cab321:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 7ea1ff4f56..d9ce39c07b 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -35,23 +35,22 @@ static void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr synchro); */ 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) + int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* this_user_data, + simgrid::kernel::activity::CommImplPtr 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::CommImplPtr comm = - boost::dynamic_pointer_cast(std::move(synchro)); + boost::dynamic_pointer_cast(std::move(*it)); 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, comm)) && - (not 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, comm.get())) && + (not comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro.get()))) { XBT_DEBUG("Found a matching communication synchro %p", comm.get()); if (remove_matching) deque->erase(it); @@ -63,7 +62,7 @@ _find_matching_comm(boost::circular_buffer_space_optimized* dequ } XBT_DEBUG("Sorry, communication synchro %p does not match our needs:" " its type is %d but we are looking for a comm of type %d (or maybe the filtering didn't match)", - comm, (int)comm->type, (int)type); + comm.get(), (int)comm->type, (int)type); } XBT_DEBUG("No matching communication synchro found"); return nullptr; @@ -72,25 +71,24 @@ _find_matching_comm(boost::circular_buffer_space_optimized* dequ /******************************************************************************/ /* Communication synchros */ /******************************************************************************/ -XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_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_activity_t), - void (*copy_data_fun)(smx_activity_t, void*, size_t), - void *data, double timeout){ +XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t src, smx_mailbox_t mbox, double task_size, + double rate, void* src_buff, size_t src_buff_size, + int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, + double timeout) +{ smx_activity_t comm = simcall_HANDLER_comm_isend(simcall, src, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0); SIMCALL_SET_MC_VALUE(simcall, 0); simcall_HANDLER_comm_wait(simcall, comm, timeout); } -XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx_actor_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_activity_t), - void (*clean_fun)(void *), // used to free the synchro in case of problem after a detached send - void (*copy_data_fun)(smx_activity_t, void*, size_t),// used to copy data if not default one - void *data, int detached) +XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( + smx_simcall_t simcall, smx_actor_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*, simgrid::kernel::activity::CommImpl*), + void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send + void (*copy_data_fun)(smx_activity_t, void*, size_t), // used to copy data if not default one + void* data, int detached) { XBT_DEBUG("send from mailbox %p", mbox); @@ -113,7 +111,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx other_comm->state = SIMIX_READY; other_comm->dst_proc=mbox->permanent_receiver.get(); mbox->done_comm_queue.push_back(other_comm); - XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, other_comm); + XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, other_comm.get()); }else{ mbox->push(other_comm); @@ -155,10 +153,10 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx } XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, - void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_activity_t), - void (*copy_data_fun)(smx_activity_t, void*, size_t), - void *data, double timeout, double rate) + void* dst_buff, size_t* dst_buff_size, + int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, + double timeout, double rate) { smx_activity_t comm = SIMIX_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); SIMCALL_SET_MC_VALUE(simcall, 0); @@ -166,18 +164,19 @@ XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t re } XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, - void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_activity_t), - void (*copy_data_fun)(smx_activity_t, void*, size_t), - void *data, double rate) + void* dst_buff, size_t* dst_buff_size, + simix_match_func_t match_fun, + void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, + double rate) { return SIMIX_comm_irecv(receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); } -smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, - int (*match_fun)(void *, void *, smx_activity_t), - void (*copy_data_fun)(smx_activity_t, void*, size_t), // used to copy data if not default one - void *data, double rate) +smx_activity_t +SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, + int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + 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::CommImplPtr this_synchro = simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE)); @@ -194,11 +193,11 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * //if not found, assume the receiver came first, register it to the mailbox in the classical way 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); + other_comm = std::move(this_synchro); + mbox->push(other_comm); } else { 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); + XBT_DEBUG("comm %p has been already sent, and is finished, destroy it", other_comm.get()); other_comm->state = SIMIX_DONE; other_comm->type = SIMIX_COMM_DONE; other_comm->mbox = nullptr; @@ -216,8 +215,8 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * if (other_comm == nullptr) { XBT_DEBUG("Receive pushed first (%zu comm enqueued so far)", mbox->comm_queue.size()); - other_comm = this_synchro; - mbox->push(this_synchro); + other_comm = std::move(this_synchro); + mbox->push(other_comm); } else { XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_comm.get()); @@ -248,15 +247,14 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * return other_comm; } -smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, - int type, int src, int tag, - int (*match_fun)(void *, void *, smx_activity_t), - void *data){ +smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, int src, int tag, + simix_match_func_t match_fun, void* data) +{ return SIMIX_comm_iprobe(simcall->issuer, mbox, type, src, tag, match_fun, data); } -smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int type, int src, - int tag, int (*match_fun)(void *, void *, smx_activity_t), void *data) +smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int type, int src, int tag, + simix_match_func_t match_fun, void* data) { XBT_DEBUG("iprobe from %p %p", mbox, &mbox->comm_queue); simgrid::kernel::activity::CommImplPtr this_comm; @@ -391,14 +389,11 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, double timeout) { - smx_activity_t synchro; - unsigned int cursor = 0; - 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); - synchro = xbt_dynar_get_as(synchros, idx, smx_activity_t); + smx_activity_t synchro = xbt_dynar_get_as(synchros, idx, smx_activity_t); synchro->simcalls.push_back(simcall); simcall_comm_waitany__set__result(simcall, idx); synchro->state = SIMIX_DONE; @@ -416,7 +411,10 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, d }); } - xbt_dynar_foreach(synchros, cursor, synchro){ + unsigned int cursor; + simgrid::kernel::activity::ActivityImpl* ptr; + xbt_dynar_foreach(synchros, cursor, ptr){ + smx_activity_t synchro = simgrid::kernel::activity::ActivityImplPtr(ptr); /* associate this simcall to the the synchro */ synchro->simcalls.push_back(simcall); @@ -430,11 +428,13 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, d void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) { - smx_activity_t synchro; unsigned int cursor = 0; xbt_dynar_t synchros = simcall_comm_waitany__get__comms(simcall); - xbt_dynar_foreach(synchros, cursor, synchro) { + simgrid::kernel::activity::ActivityImpl* ptr; + xbt_dynar_foreach(synchros, cursor, ptr){ + smx_activity_t synchro = simgrid::kernel::activity::ActivityImplPtr(ptr); + // Remove the first occurence of simcall: auto i = boost::range::find(synchro->simcalls, simcall); if (i != synchro->simcalls.end()) @@ -562,7 +562,7 @@ void SIMIX_comm_finish(smx_activity_t synchro) 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, + synchro.get(), 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) {