X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/69fa0c6e72fedc8b1016965248dc3c5665c24292..5a5f54e7f74566a2418d243e7885e737c2312a36:/src/simix/smx_network.cpp diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index 151a5772fa..ea85a581f3 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -16,7 +16,7 @@ #include "simgrid/s4u/Activity.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "src/mc/mc_replay.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" @@ -84,7 +84,7 @@ XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sr 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, + 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 @@ -163,8 +163,8 @@ XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t re simcall_HANDLER_comm_wait(simcall, comm, timeout); } -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, +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, simix_match_func_t match_fun, void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double rate) @@ -247,14 +247,14 @@ SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void* dst_buff, size_ return other_comm; } -smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, int src, int tag, +smx_activity_t simcall_HANDLER_comm_iprobe(smx_simcall_t simcall, smx_mailbox_t mbox, int type, simix_match_func_t match_fun, void* data) { - return SIMIX_comm_iprobe(simcall->issuer, mbox, type, src, tag, match_fun, data); + return SIMIX_comm_iprobe(simcall->issuer, mbox, type, match_fun, 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) +smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int type, simix_match_func_t match_fun, + void* data) { XBT_DEBUG("iprobe from %p %p", mbox, &mbox->comm_queue); simgrid::kernel::activity::CommImplPtr this_comm; @@ -315,7 +315,8 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, smx_activity_t synchro, do /* otherwise set up a waiting timeout on the right side */ 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 */ + } else { /* 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); @@ -458,13 +459,13 @@ static inline void SIMIX_comm_start(simgrid::kernel::activity::CommImplPtr comm) 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); + XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", comm.get(), sender->getCname(), + receiver->getCname(), 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(), - receiver->cname()); + XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->getCname(), + receiver->getCname()); comm->state = SIMIX_LINK_FAILURE; comm->cleanupSurf(); } @@ -475,11 +476,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->cname(), comm->src_proc->host->cname()); + comm->src_proc->getCname(), comm->src_proc->host->getCname()); else XBT_DEBUG("The communication is suspended on startup because dst (%s@%s) was suspended since it initiated the " "communication", - comm->dst_proc->cname(), comm->dst_proc->host->cname()); + comm->dst_proc->getCname(), comm->dst_proc->host->getCname()); comm->surf_comm->suspend(); } @@ -546,7 +547,6 @@ void SIMIX_comm_finish(smx_activity_t synchro) 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; @@ -554,7 +554,6 @@ void SIMIX_comm_finish(smx_activity_t synchro) 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; @@ -562,9 +561,9 @@ 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->cname() : nullptr, - comm->dst_proc ? comm->dst_proc->host->cname() : nullptr, simcall->issuer->cname(), simcall->issuer, - comm->detached); + synchro.get(), comm->src_proc ? comm->src_proc->host->getCname() : nullptr, + comm->dst_proc ? comm->dst_proc->host->getCname() : nullptr, simcall->issuer->getCname(), + simcall->issuer, comm->detached); if (comm->src_proc == simcall->issuer) { XBT_DEBUG("I'm source"); } else if (comm->dst_proc == simcall->issuer) { @@ -686,8 +685,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->cname() : "a finished process", comm->src_buff, - comm->dst_proc ? comm->dst_proc->host->cname() : "a finished process", comm->dst_buff, buff_size); + 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); /* Copy at most dst_buff_size bytes of the message to receiver's buffer */ if (comm->dst_buff_size)