X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..3ba5d4a966c2ac976b2b1656c52145f70189d108:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index b10306a84f..07f4c3c8e6 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -7,36 +7,33 @@ #include +#include "src/kernel/activity/CommImpl.hpp" #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 "src/kernel/activity/SynchroComm.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); 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::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); +static void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr synchro); /** * \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::Comm* +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) @@ -45,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::Comm *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 || 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); + XBT_DEBUG("Found a matching communication synchro %p", comm.get()); if (remove_matching) deque->erase(it); - comm->ref(); #if SIMGRID_HAVE_MC comm->mbox_cpy = comm->mbox; #endif @@ -66,7 +63,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; @@ -95,39 +92,37 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx 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 %p", mbox); + XBT_DEBUG("send from mailbox %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_comm = new simgrid::kernel::activity::Comm(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::Comm* 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; + other_comm = std::move(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)); + XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, other_comm.get()); }else{ - mbox->push(this_comm); + mbox->push(other_comm); } } else { XBT_DEBUG("Receive already pushed"); - this_comm->unref(); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; - } src_proc->comms.push_back(other_comm); @@ -184,12 +179,13 @@ 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::CommImplPtr this_synchro = + simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl(SIMIX_COMM_RECEIVE)); + XBT_DEBUG("recv from mbox %p. this_synchro=%p", mbox, this_synchro.get()); - simgrid::kernel::activity::Comm* other_comm; + simgrid::kernel::activity::CommImplPtr other_comm; //communication already done, get it inside the list of completed comms - if (mbox->permanent_receiver != nullptr && ! mbox->done_comm_queue.empty()) { + 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 list of already received comms @@ -201,14 +197,12 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * other_comm = this_synchro; mbox->push(this_synchro); } 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); + 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.get()); other_comm->state = SIMIX_DONE; other_comm->type = SIMIX_COMM_DONE; other_comm->mbox = nullptr; } - other_comm->unref(); - static_cast(this_synchro)->unref(); } } else { /* Prepare a comm describing us, so that it gets passed to the user-provided filter of other side */ @@ -220,12 +214,12 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void * other_comm = _find_matching_comm(&mbox->comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro, /*remove_matching*/ true); - if (not other_comm) { - XBT_DEBUG("Receive pushed first %zu", mbox->comm_queue.size()); + 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); } else { - this_synchro->unref(); + XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_comm.get()); other_comm->state = SIMIX_READY; other_comm->type = SIMIX_COMM_READY; @@ -265,15 +259,15 @@ 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::CommImplPtr this_comm; int smx_type; if(type == 1){ - this_comm = new simgrid::kernel::activity::Comm(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::Comm(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; 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"); @@ -286,17 +280,13 @@ 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; } void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, double timeout) { /* Associate this simcall to the wait synchro */ - XBT_DEBUG("simcall_HANDLER_comm_wait, %p", synchro); + XBT_DEBUG("simcall_HANDLER_comm_wait, %p", synchro.get()); synchro->simcalls.push_back(simcall); simcall->issuer->waiting_synchro = synchro; @@ -311,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::Comm *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 @@ -328,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::Comm *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 @@ -340,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::Comm *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); @@ -363,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. @@ -375,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; @@ -385,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); @@ -398,21 +391,18 @@ void simcall_HANDLER_comm_testany( 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"); + 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; SIMIX_comm_finish(synchro); return; } - + if (timeout < 0.0){ simcall->timer = NULL; } else { @@ -422,8 +412,11 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, xbt_dynar_t synchros, d SIMIX_simcall_answer(simcall); }); } - - 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); @@ -437,11 +430,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()) @@ -453,22 +448,21 @@ void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall) * \brief Starts the simulation of a communication synchro. * \param synchro the communication synchro */ -static inline void SIMIX_comm_start(smx_activity_t synchro) +static inline void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr comm) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); - /* If both the sender and the receiver are already there, start the communication */ - if (synchro->state == SIMIX_READY) { + if (comm->state == SIMIX_READY) { 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->surf_comm->setData(comm.get()); comm->state = SIMIX_RUNNING; + XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", comm.get(), 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(), @@ -500,17 +494,16 @@ 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::CommImplPtr comm = + boost::static_pointer_cast(synchro); 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 @@ -521,12 +514,13 @@ void SIMIX_comm_finish(smx_activity_t synchro) simcall->timer = nullptr; } 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)); + 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) - comm->mbox->remove(synchro); + comm->mbox->remove(comm); XBT_DEBUG("SIMIX_comm_finish: synchro state = %d", (int)synchro->state); @@ -536,63 +530,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.get()); + 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.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) { + 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); } } @@ -642,16 +635,10 @@ void SIMIX_comm_finish(smx_activity_t synchro) 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++; } - - while (destroy_count-- > 0) - static_cast(synchro)->unref(); } /******************************************************************************/ @@ -666,7 +653,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::Comm *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 +662,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::Comm *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); @@ -684,21 +673,21 @@ 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::CommImplPtr comm = + boost::static_pointer_cast(synchro); size_t buff_size = comm->src_buff_size; /* If there is no data to copy then return */ 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, + XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", comm.get(), comm->src_proc ? comm->src_proc->host->cname() : "a finished process", comm->src_buff, comm->dst_proc ? comm->dst_proc->host->cname() : "a finished process", comm->dst_buff, buff_size); @@ -717,7 +706,6 @@ 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;