X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ca0df6f5bb17b5708c11a19846c0e90e25b7889..9caf173e476622d309cc5653a83d224d05787cc7:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 3852732056..d147d4d5c8 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -464,13 +464,13 @@ static inline void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr comm) comm->surfAction_->set_data(comm.get()); comm->state = SIMIX_RUNNING; - XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", comm.get(), sender->getCname(), - receiver->getCname(), comm->surfAction_); + XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", comm.get(), sender->get_cname(), + receiver->get_cname(), comm->surfAction_); /* If a link is failed, detect it immediately */ if (comm->surfAction_->get_state() == simgrid::kernel::resource::Action::State::failed) { - XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->getCname(), - receiver->getCname()); + XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->get_cname(), + receiver->get_cname()); comm->state = SIMIX_LINK_FAILURE; comm->cleanupSurf(); } @@ -481,11 +481,11 @@ static inline void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr comm) if (comm->src_proc->isSuspended()) XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the " "communication", - comm->src_proc->getCname(), comm->src_proc->host->getCname()); + comm->src_proc->get_cname(), comm->src_proc->host->get_cname()); else XBT_DEBUG("The communication is suspended on startup because dst (%s@%s) was suspended since it initiated the " "communication", - comm->dst_proc->getCname(), comm->dst_proc->host->getCname()); + comm->dst_proc->get_cname(), comm->dst_proc->host->get_cname()); comm->surfAction_->suspend(); } @@ -566,8 +566,8 @@ 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.get(), comm->src_proc ? comm->src_proc->host->getCname() : nullptr, - comm->dst_proc ? comm->dst_proc->host->getCname() : nullptr, simcall->issuer->getCname(), + synchro.get(), comm->src_proc ? comm->src_proc->host->get_cname() : nullptr, + comm->dst_proc ? comm->dst_proc->host->get_cname() : nullptr, simcall->issuer->get_cname(), simcall->issuer, comm->detached); if (comm->src_proc == simcall->issuer) { XBT_DEBUG("I'm source"); @@ -690,8 +690,8 @@ void SIMIX_comm_copy_data(smx_activity_t synchro) return; XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", comm.get(), - comm->src_proc ? comm->src_proc->host->getCname() : "a finished process", comm->src_buff, - comm->dst_proc ? comm->dst_proc->host->getCname() : "a finished process", comm->dst_buff, buff_size); + comm->src_proc ? comm->src_proc->host->get_cname() : "a finished process", comm->src_buff, + comm->dst_proc ? comm->dst_proc->host->get_cname() : "a finished process", comm->dst_buff, buff_size); /* Copy at most dst_buff_size bytes of the message to receiver's buffer */ if (comm->dst_buff_size)