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)
if (SIMIX_process_is_suspended(action->comm.src_proc) ||
SIMIX_process_is_suspended(action->comm.dst_proc)) {
/* FIXME: check what should happen with the action state */
+
+ if (SIMIX_process_is_suspended(action->comm.src_proc))
+ XBT_DEBUG("The communication is suspended on startup because src (%s:%s) were suspended since it initiated the communication",
+ SIMIX_host_get_name(action->comm.src_proc->smx_host), action->comm.src_proc->name);
+ else
+ XBT_DEBUG("The communication is suspended on startup because dst (%s:%s) were suspended since it initiated the communication",
+ SIMIX_host_get_name(action->comm.dst_proc->smx_host), action->comm.dst_proc->name);
+
surf_workstation_model->suspend(action->comm.surf_comm);
+
}
}
}
void SIMIX_comm_suspend(smx_action_t action)
{
/*FIXME: shall we suspend also the timeout actions? */
- surf_workstation_model->suspend(action->comm.surf_comm);
+ if (action->comm.surf_comm)
+ surf_workstation_model->suspend(action->comm.surf_comm);
+ /* in the other case, the action will be suspended on creation, in SIMIX_comm_start() */
}
void SIMIX_comm_resume(smx_action_t action)
{
/*FIXME: check what happen with the timeouts */
- surf_workstation_model->resume(action->comm.surf_comm);
+ if (action->comm.surf_comm)
+ surf_workstation_model->resume(action->comm.surf_comm);
+ /* in the other case, the action were not really suspended yet, see SIMIX_comm_suspend() and SIMIX_comm_start() */
}
{
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)",