X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d2b5d103ae0005f09a3b3a2b073178106c778f5..825fb3d5095e6cce48885d1d04ab1ec3823dae6c:/src/simix/smx_network.c diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index a21f74e4fc..28937f42a5 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -20,8 +20,8 @@ static void SIMIX_comm_copy_data(smx_action_t comm); static smx_action_t SIMIX_comm_new(e_smx_comm_type_t type); static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm); static smx_action_t SIMIX_rdv_get_comm(smx_rdv_t rdv, e_smx_comm_type_t type, - int (*match_fun)(void *, void *,smx_action_t), - void *user_data, smx_action_t my_action); + int (*match_fun)(void *, void *,smx_action_t), + void *user_data, smx_action_t my_action); static void SIMIX_rdv_free(void *data); void SIMIX_network_init(void) @@ -205,9 +205,9 @@ void SIMIX_comm_destroy(smx_action_t action) action, action->comm.refcount, (int)action->state); if (action->comm.refcount <= 0) { - xbt_backtrace_display_current(); - xbt_die("the refcount of comm %p is already 0 before decreasing it. " - "That's a bug!", action); + xbt_backtrace_display_current(); + xbt_die("The refcount of comm %p is already 0 before decreasing it. " + "That's a bug! If you didn't test and/or wait the same communication twice in your code, then the bug is SimGrid's...", action); } action->comm.refcount--; if (action->comm.refcount > 0) @@ -518,7 +518,7 @@ XBT_INLINE void SIMIX_comm_start(smx_action_t action) /* If a link is failed, detect it immediately */ if (surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED) { XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", - SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver)); + SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver)); action->state = SIMIX_LINK_FAILURE; SIMIX_comm_destroy_internal_actions(action); } @@ -671,7 +671,7 @@ void SIMIX_post_comm(smx_action_t action) action->state = SIMIX_DST_HOST_FAILURE; else if (action->comm.surf_comm && surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED) { - XBT_DEBUG("Puta madre. Surf says that the link broke"); + XBT_DEBUG("Puta madre. Surf says that the link broke"); action->state = SIMIX_LINK_FAILURE; } else action->state = SIMIX_DONE; @@ -858,7 +858,7 @@ void SIMIX_comm_copy_data(smx_action_t comm) { size_t buff_size = comm->comm.src_buff_size; /* If there is no data to be copy then return */ - if (!comm->comm.src_buff || !comm->comm.dst_buff || comm->comm.copied == 1) + if (!comm->comm.src_buff || !comm->comm.dst_buff || comm->comm.copied) return; XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",