X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..5d828a1cf7b707b2ee183f4dd991b21e70949290:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 930d90e43e..40e0f17a51 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -20,13 +20,13 @@ #include "mc/mc.h" -#include "smx_private.h" +#include "smx_private.hpp" #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_replay.h" #include "src/mc/remote/Client.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/surf_interface.hpp" @@ -73,8 +73,10 @@ void SIMIX_process_cleanup(smx_actor_t process) SIMIX_process_on_exit_runall(process); /* Unregister from the kill timer if any */ - if (process->kill_timer != nullptr) + if (process->kill_timer != nullptr) { SIMIX_timer_remove(process->kill_timer); + process->kill_timer = nullptr; + } xbt_os_mutex_acquire(simix_global->mutex); @@ -167,7 +169,7 @@ void ActorImpl::daemonize() simgrid::s4u::Actor* ActorImpl::restart() { - XBT_DEBUG("Restarting process %s on %s", cname(), host->getCname()); + XBT_DEBUG("Restarting process %s on %s", getCname(), host->getCname()); // retrieve the arguments of the old process // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? @@ -185,7 +187,7 @@ simgrid::s4u::Actor* ActorImpl::restart() // start the new process ActorImpl* actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host, - arg.properties, nullptr); + arg.properties.get(), nullptr); if (arg.kill_time >= 0) simcall_process_set_kill_time(actor, arg.kill_time); if (arg.auto_restart) @@ -344,12 +346,12 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->getCname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); simix_global->process_to_run.push_back(process); intrusive_ptr_add_ref(process); /* Tracing the process creation */ - TRACE_msg_process_create(process->cname(), process->pid, process->host); + TRACE_msg_process_create(process->getCname(), process->pid, process->host); return process; } @@ -408,11 +410,11 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->getCname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); simix_global->process_to_run.push_back(process); /* Tracing the process creation */ - TRACE_msg_process_create(process->cname(), process->pid, process->host); + TRACE_msg_process_create(process->getCname(), process->pid, process->host); auto context = dynamic_cast(process->context); if (not context) @@ -428,16 +430,10 @@ void SIMIX_process_detach() if (not context) xbt_die("Not a suitable context"); - simix_global->cleanup_process_function(context->process()); - - // Let maestro ignore we are still alive: - // xbt_swag_remove(context->process(), simix_global->process_list); - - // TODO, Remove from proces list: - // xbt_swag_remove(process, sg_host_simix(host)->process_list); - + auto process = context->process(); + simix_global->cleanup_process_function(process); context->attach_stop(); - // delete context; + delete process; } /** @@ -468,7 +464,7 @@ void SIMIX_process_runall() */ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { - XBT_DEBUG("Killing process %s@%s", process->cname(), process->host->getCname()); + XBT_DEBUG("Killing process %s@%s", process->getCname(), process->host->getCname()); process->context->iwannadie = 1; process->blocked = 0; @@ -510,13 +506,6 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { xbt_die("Unknown type of activity"); } - /* - switch (process->waiting_synchro->type) { - case SIMIX_SYNC_JOIN: - SIMIX_process_sleep_destroy(process->waiting_synchro); - break; - } */ - process->waiting_synchro = nullptr; } if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), process) == @@ -598,10 +587,6 @@ void SIMIX_process_killall(smx_actor_t issuer, int reset_pid) if (reset_pid > 0) simix_process_maxpid = reset_pid; - - SIMIX_context_runall(); - - SIMIX_process_empty_trash(); } void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest) @@ -683,49 +668,19 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, do simcall->issuer->waiting_synchro = sync; } -static int SIMIX_process_join_finish(smx_process_exit_status_t status, void* synchro) -{ - simgrid::kernel::activity::SleepImpl* sleep = static_cast(synchro); - - if (sleep->surf_sleep) { - sleep->surf_sleep->cancel(); - - while (not sleep->simcalls.empty()) { - smx_simcall_t simcall = sleep->simcalls.front(); - sleep->simcalls.pop_front(); - simcall_process_sleep__set__result(simcall, SIMIX_DONE); - simcall->issuer->waiting_synchro = nullptr; - if (simcall->issuer->suspended) { - XBT_DEBUG("Wait! This process is suspended and can't wake up now."); - simcall->issuer->suspended = 0; - simcall_HANDLER_process_suspend(simcall, simcall->issuer); - } else { - SIMIX_simcall_answer(simcall); - } - } - sleep->surf_sleep->unref(); - sleep->surf_sleep = nullptr; - } - // intrusive_ptr_release(process); // FIXME: We are leaking here. See comment in SIMIX_process_join() - return 0; -} - smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout) { smx_activity_t res = issuer->sleep(timeout); intrusive_ptr_add_ref(res.get()); - /* 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, [](void*, void* arg) { - return simgrid::simix::kernelImmediate( - [&] { return SIMIX_process_join_finish(SMX_EXIT_SUCCESS, arg); }); + auto sleep = static_cast(arg); + if (sleep->surf_sleep) + sleep->surf_sleep->finish(simgrid::surf::Action::State::done); + intrusive_ptr_release(sleep); + return 0; }, - &*res); + res.get()); return res; } @@ -763,7 +718,7 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro) */ void SIMIX_process_yield(smx_actor_t self) { - XBT_DEBUG("Yield actor '%s'", self->cname()); + XBT_DEBUG("Yield actor '%s'", self->getCname()); /* Go into sleep and return control to maestro */ self->context->suspend(); @@ -783,11 +738,11 @@ void SIMIX_process_yield(smx_actor_t self) SIMIX_process_on_exit_runall(self); /* Add the process to the list of process to restart, only if the host is down */ if (self->auto_restart && self->host->isOff()) { - SIMIX_host_add_auto_restart_process(self->host, self->cname(), self->code, self->userdata, + SIMIX_host_add_auto_restart_process(self->host, self->getCname(), self->code, self->userdata, SIMIX_timer_get_date(self->kill_timer), self->getProperties(), self->auto_restart); } - XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->getCname()); + XBT_DEBUG("Process %s@%s is dead", self->getCname(), self->host->getCname()); self->context->stop(); } @@ -834,8 +789,8 @@ void SIMIX_process_on_exit_runall(smx_actor_t process) { smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; while (not process->on_exit.empty()) { s_smx_process_exit_fun_t exit_fun = process->on_exit.back(); - (exit_fun.fun)((void*)exit_status, exit_fun.arg); process->on_exit.pop_back(); + (exit_fun.fun)((void*)exit_status, exit_fun.arg); } }