delete this->context;
}
-static int dying_daemon(void* exit_status, void* data)
+static void dying_daemon(int /*exit_status*/, void* data)
{
std::vector<ActorImpl*>* vect = &simix_global->daemons;
/* 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()
{
smx_activity_t res = issuer->sleep(timeout);
intrusive_ptr_add_ref(res.get());
SIMIX_process_on_exit(process,
- [](void*, void* arg) {
+ [](int, void* arg) {
auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
if (sleep->surf_sleep)
sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED);
intrusive_ptr_release(sleep);
- return 0;
},
res.get());
return res;
while (not process->on_exit.empty()) {
s_smx_process_exit_fun_t exit_fun = process->on_exit.back();
process->on_exit.pop_back();
- (exit_fun.fun)((void*)exit_status, exit_fun.arg);
+ (exit_fun.fun)(exit_status, exit_fun.arg);
}
}
-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 ?");
+void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data)
+{
+ SIMIX_process_on_exit(process, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
+}
- s_smx_process_exit_fun_t exit_fun = {fun, data};
+void SIMIX_process_on_exit(smx_actor_t process, std::function<void(int, void*)> fun, void* data)
+{
+ xbt_assert(process, "current process not found: are you in maestro context ?");
- process->on_exit.push_back(exit_fun);
+ process->on_exit.emplace_back(s_smx_process_exit_fun_t{fun, data});
}
/**