}
xbt_fifo_push(src_proc->comms, other_synchro);
- /* if the communication synchro is detached then decrease the refcount
- * by one, so it will be eliminated by the receiver's destroy call */
+
if (detached) {
other_comm->detached = true;
- other_comm->ref();
other_comm->clean_fun = clean_fun;
} else {
other_comm->clean_fun = NULL;
if(simcall->issuer == comm->dst_proc){
if(comm->src_proc)
xbt_fifo_remove(comm->src_proc->comms, synchro);
+ //in case of a detached comm we have an extra ref to remove, as the sender won't do it
+ destroy_count++;
}
}
SIMIX_simcall_answer(simcall);
comm, (int)comm->state, comm->src_proc, comm->dst_proc);
comm->dst_proc = NULL;
- if (comm->detached && /* FIXME: This code should be moved within comm->unref() anyway. comm->refcount == 1 &&*/ comm->src_proc != NULL) {
+ if (comm->detached && comm->src_proc != NULL) {
/* the comm will be freed right now, remove it from the sender */
xbt_fifo_remove(comm->src_proc->comms, comm);
}
+
comm->unref();
} else {
xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);