X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2558c8c0eb206ff353cb88672f5a90cd0e2562d3..f8498e93073ae2ad6e6e19571ecf52c9104edbd0:/src/kernel/activity/CommImpl.cpp diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index ef42412ba0..8aa5747069 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.cpp @@ -35,7 +35,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( 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)(simgrid::kernel::activity::CommImpl*, void*, size_t), // used to copy data if not default one - void* data, int detached) + void* data, bool detached) { XBT_DEBUG("send from mailbox %p", mbox); @@ -71,13 +71,13 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( other_comm->state_ = SIMIX_READY; other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY); } - src_proc->comms.push_back(other_comm); if (detached) { - other_comm->detached = true; + other_comm->detached_ = true; other_comm->clean_fun = clean_fun; } else { other_comm->clean_fun = nullptr; + src_proc->comms.push_back(other_comm); } /* Setup the communication synchro */ @@ -88,12 +88,10 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( other_comm->match_fun = match_fun; other_comm->copy_data_fun = copy_data_fun; - if (MC_is_active() || MC_record_replay_is_active()) { + if (MC_is_active() || MC_record_replay_is_active()) other_comm->state_ = SIMIX_RUNNING; - return (detached ? nullptr : other_comm); - } - - other_comm->start(); + else + other_comm->start(); return (detached ? nullptr : other_comm); } @@ -136,7 +134,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( other_comm = std::move(this_synchro); mbox->push(other_comm); } else { - if (other_comm->surf_action_ && other_comm->remains() < 1e-12) { + if (other_comm->surf_action_ && other_comm->get_remaining() < 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->set_type(simgrid::kernel::activity::CommImpl::Type::DONE); @@ -220,7 +218,7 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity: comm->finish(); } else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */ simgrid::kernel::resource::Action* sleep = simcall->issuer->get_host()->pimpl_cpu->sleep(timeout); - sleep->set_data(comm); + sleep->set_activity(comm); if (simcall->issuer == comm->src_actor_) comm->src_timeout_ = sleep; @@ -343,7 +341,7 @@ void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, { XBT_DEBUG("Copy the data over"); memcpy(comm->dst_buff_, buff, buff_size); - if (comm->detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the + if (comm->detached_) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the // original buffer available to the application ASAP xbt_free(buff); comm->src_buff_ = nullptr; @@ -399,12 +397,11 @@ CommImpl& CommImpl::set_dst_buff(void* buff, size_t* size) CommImpl::~CommImpl() { - XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast(state_), - static_cast(detached)); + XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast(state_), detached_); cleanupSurf(); - if (detached && state_ != SIMIX_DONE) { + if (detached_ && state_ != SIMIX_DONE) { /* the communication has failed and was detached: * we have to free the buffer */ if (clean_fun) @@ -425,7 +422,8 @@ CommImpl* CommImpl::start() s4u::Host* receiver = dst_actor_->get_host(); surf_action_ = surf_network_model->communicate(sender, receiver, size_, rate_); - surf_action_->set_data(this); + surf_action_->set_activity(this); + surf_action_->set_category(get_tracing_category()); state_ = SIMIX_RUNNING; XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", this, sender->get_cname(), @@ -509,7 +507,7 @@ void CommImpl::cancel() { /* if the synchro is a waiting state means that it is still in a mbox so remove from it and delete it */ if (state_ == SIMIX_WAITING) { - if (not detached) { + if (not detached_) { mbox->remove(this); state_ = SIMIX_CANCELED; } @@ -519,19 +517,10 @@ void CommImpl::cancel() } } -/** @brief get the amount remaining from the communication */ -double CommImpl::remains() -{ - return surf_action_->get_remains(); -} - /** @brief This is part of the cleanup process, probably an internal command */ void CommImpl::cleanupSurf() { - if (surf_action_) { - surf_action_->unref(); - surf_action_ = nullptr; - } + clean_action(); if (src_timeout_) { src_timeout_->unref(); @@ -561,7 +550,7 @@ void CommImpl::post() state_ = SIMIX_DONE; XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", this, (int)state_, - src_actor_.get(), dst_actor_.get(), detached); + src_actor_.get(), dst_actor_.get(), detached_); /* destroy the surf actions associated with the Simix communication */ cleanupSurf(); @@ -648,7 +637,7 @@ void CommImpl::finish() "detached:%d", this, src_actor_ ? src_actor_->get_host()->get_cname() : nullptr, dst_actor_ ? dst_actor_->get_host()->get_cname() : nullptr, simcall->issuer->get_cname(), - simcall->issuer, detached); + simcall->issuer, detached_); if (src_actor_ == simcall->issuer) { XBT_DEBUG("I'm source"); } else if (dst_actor_ == simcall->issuer) { @@ -707,7 +696,7 @@ void CommImpl::finish() simcall->issuer->waiting_synchro = nullptr; simcall->issuer->comms.remove(this); - if (detached) { + if (detached_) { if (simcall->issuer == src_actor_) { if (dst_actor_) dst_actor_->comms.remove(this);