From: Martin Quinson Date: Mon, 9 May 2016 20:25:57 +0000 (+0200) Subject: cosmetics X-Git-Tag: v3_14~1247 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/78c279dafeaf98e75a7db7ccb30c5179dd446353 cosmetics --- diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index af29a4c42a..bec9527d1d 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -549,16 +549,13 @@ static inline void SIMIX_comm_start(smx_synchro_t synchro) /* If any of the process is suspend, create the synchro but stop its execution, it will be restarted when the sender process resume */ - if (SIMIX_process_is_suspended(comm->src_proc) || - SIMIX_process_is_suspended(comm->dst_proc)) { - /* FIXME: check what should happen with the synchro state */ - + if (SIMIX_process_is_suspended(comm->src_proc) || SIMIX_process_is_suspended(comm->dst_proc)) { if (SIMIX_process_is_suspended(comm->src_proc)) - XBT_DEBUG("The communication is suspended on startup because src (%s:%s) were suspended since it initiated the communication", - sg_host_get_name(comm->src_proc->host), comm->src_proc->name); + XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the communication", + comm->src_proc->name, sg_host_get_name(comm->src_proc->host)); else - XBT_DEBUG("The communication is suspended on startup because dst (%s:%s) were suspended since it initiated the communication", - sg_host_get_name(comm->dst_proc->host), comm->dst_proc->name); + XBT_DEBUG("The communication is suspended on startup because dst (%s@%s) was suspended since it initiated the communication", + comm->dst_proc->name, sg_host_get_name(comm->dst_proc->host)); comm->surf_comm->suspend(); } @@ -730,9 +727,8 @@ void SIMIX_post_comm(smx_synchro_t synchro) comm->cleanupSurf(); /* if there are simcalls associated with the synchro, then answer them */ - if (xbt_fifo_size(synchro->simcalls)) { + if (xbt_fifo_size(synchro->simcalls)) SIMIX_comm_finish(comm); - } } /******************************************************************************/