*/
int SIMIX_process_has_pending_comms(smx_actor_t process) {
- return xbt_fifo_size(process->comms) > 0;
+ return process->comms.size() > 0;
}
/**
xbt_os_mutex_acquire(simix_global->mutex);
/* cancel non-blocking communications */
- smx_activity_t synchro = static_cast<smx_activity_t>(xbt_fifo_pop(process->comms));
- while (synchro != nullptr) {
+ smx_activity_t synchro = static_cast<smx_activity_t>(process->comms.front());
+ while (!process->comms.empty()) {
simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
/* make sure no one will finish the comm after this process is destroyed,
if (comm->detached && comm->src_proc != nullptr) {
/* the comm will be freed right now, remove it from the sender */
- xbt_fifo_remove(comm->src_proc->comms, comm);
+ comm->src_proc->comms.remove(comm);
}
comm->unref();
} else {
xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
}
- synchro = static_cast<smx_activity_t>(xbt_fifo_pop(process->comms));
+ process->comms.pop_front();
+ synchro = static_cast<smx_activity_t>(process->comms.front());
}
XBT_DEBUG("%p should not be run anymore",process);
delete this->context;
if (this->properties)
xbt_dict_free(&this->properties);
- if (this->comms != nullptr)
- xbt_fifo_free(this->comms);
if (this->on_exit)
xbt_dynar_free(&this->on_exit);
}
exec->unref();
} else if (comm != nullptr) {
- xbt_fifo_remove(process->comms, process->waiting_synchro);
+ process->comms.remove(process->waiting_synchro);
comm->cancel();
// Remove first occurrence of &process->simcall:
simgrid::kernel::activity::Comm *comm = dynamic_cast<simgrid::kernel::activity::Comm*>(process->waiting_synchro);
if (comm != nullptr) {
- xbt_fifo_remove(process->comms, comm);
+ process->comms.remove(comm);
comm->cancel();
}
sleep->surf_sleep = nullptr;
}
sleep->unref();
+ // intrusive_ptr_release(process); // FIXME: We are leaking here. See comment in SIMIX_process_join()
return 0;
}
{
smx_activity_t res = SIMIX_process_sleep(issuer, timeout);
static_cast<simgrid::kernel::activity::ActivityImpl*>(res)->ref();
+ /* We are leaking the process here, but if we don't take the ref, we get a "use after free".
+ * The correct solution would be to derivate the type SynchroSleep into a SynchroProcessJoin,
+ * but the code is not clean enough for now for this.
+ * The C API should first be properly replaced with the C++ one, which is a fair amount of work.
+ */
+ intrusive_ptr_add_ref(process);
SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
return res;
}