*/
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);
/**
* Garbage collection
*
- * Should be called some time to time to free the memory allocated for processes
- * that have finished (or killed).
+ * Should be called some time to time to free the memory allocated for processes that have finished (or killed).
*/
void SIMIX_process_empty_trash()
{
- smx_actor_t process = nullptr;
+ smx_actor_t process = static_cast<smx_actor_t>(xbt_swag_extract(simix_global->process_to_destroy));
- while ((process = (smx_actor_t) xbt_swag_extract(simix_global->process_to_destroy))) {
+ while (process) {
XBT_DEBUG("Getting rid of %p",process);
intrusive_ptr_release(process);
+ process = static_cast<smx_actor_t>(xbt_swag_extract(simix_global->process_to_destroy));
}
}
ActorImpl::~ActorImpl()
{
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);
+ xbt_dict_free(&this->properties);
+}
+
+static int dying_daemon(void* exit_status, void* data)
+{
+ std::vector<ActorImpl*>* vect = &simix_global->daemons;
+
+ auto it = std::find(vect->begin(), vect->end(), static_cast<ActorImpl*>(data));
+ xbt_assert(it != vect->end(), "The dying daemon is not a daemon after all. Please report that bug.");
+
+ /* Don't move the whole content since we don't really care about the order */
+ std::swap(*it, vect->back());
+ vect->pop_back();
+
+ return 0;
+}
+/** This process will be terminated automatically when the last non-daemon process finishes */
+void ActorImpl::daemonize()
+{
+ if (!daemon) {
+ daemon = true;
+ simix_global->daemons.push_back(this);
+ SIMIX_process_on_exit(this, dying_daemon, this);
+ }
+}
+
+/** Whether this process is daemonized */
+bool ActorImpl::isDaemon()
+{
+ return daemon;
}
void create_maestro(std::function<void()> code)
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();
}
{
process->new_host = dest;
}
+
void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest)
{
xbt_assert((process != nullptr), "Invalid parameters");
{
XBT_IN("process = %p", process);
- if(process->context->iwannadie) {
+ if (process->context->iwannadie) {
XBT_VERB("Ignoring request to suspend a process that is currently dying.");
return;
}
- if(!process->suspended) return;
+ if (!process->suspended)
+ return;
process->suspended = 0;
/* resume the synchronization that was blocking the resumed process. */
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;
}
void SIMIX_process_on_exit_runall(smx_actor_t process) {
s_smx_process_exit_fun_t exit_fun;
smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
- while (!xbt_dynar_is_empty(process->on_exit)) {
- exit_fun = xbt_dynar_pop_as(process->on_exit,s_smx_process_exit_fun_t);
+ while (!process->on_exit.empty()) {
+ exit_fun = process->on_exit.back();
(exit_fun.fun)((void*)exit_status, exit_fun.arg);
+ process->on_exit.pop_back();
}
}
void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data) {
xbt_assert(process, "current process not found: are you in maestro context ?");
- if (!process->on_exit) {
- process->on_exit = xbt_dynar_new(sizeof(s_smx_process_exit_fun_t), nullptr);
- }
-
s_smx_process_exit_fun_t exit_fun = {fun, data};
- xbt_dynar_push_as(process->on_exit,s_smx_process_exit_fun_t,exit_fun);
+ process->on_exit.push_back(exit_fun);
}
/**
