X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1e469ce075c0a1ad21a7fd0fdb587f9a3cb5289..3ba5d4a966c2ac976b2b1656c52145f70189d108:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index b16b66de41..edc1116029 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -10,20 +10,20 @@ #include -#include -#include -#include -#include -#include +#include "xbt/dict.h" +#include "xbt/ex.hpp" +#include "xbt/functional.hpp" +#include "xbt/log.h" +#include "xbt/sysdep.h" #include "simgrid/s4u/Host.hpp" -#include +#include "mc/mc.h" #include "smx_private.h" +#include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" -#include "src/kernel/activity/SynchroSleep.hpp" #include "src/mc/mc_replay.h" #include "src/mc/remote/Client.hpp" #include "src/msg/msg_private.h" @@ -81,55 +81,47 @@ int SIMIX_process_has_pending_comms(smx_actor_t process) { */ void SIMIX_process_cleanup(smx_actor_t process) { - XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", - process->name.c_str(), process, process->waiting_synchro); + XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->name.c_str(), process, + process->waiting_synchro.get()); process->finished = true; SIMIX_process_on_exit_runall(process); /* Unregister from the kill timer if any */ if (process->kill_timer != nullptr) - SIMIX_timer_remove(process->kill_timer); + SIMIX_timer_remove(process->kill_timer); xbt_os_mutex_acquire(simix_global->mutex); /* cancel non-blocking communications */ - smx_activity_t synchro = static_cast(process->comms.front()); - while (!process->comms.empty()) { - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + smx_activity_t synchro = process->comms.front(); + while (not process->comms.empty()) { + simgrid::kernel::activity::CommImplPtr comm = + boost::static_pointer_cast(synchro); /* make sure no one will finish the comm after this process is destroyed, * because src_proc or dst_proc would be an invalid pointer */ - comm->cancel(); if (comm->src_proc == process) { - XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", - comm, comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc); + XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(), + comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc); comm->src_proc = nullptr; - /* I'm not supposed to destroy a detached comm from the sender side, */ - if (comm->detached) - XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender"); - else - comm->unref(); - - } - else if (comm->dst_proc == process){ - XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", - comm, (int)comm->state, comm->src_proc, comm->dst_proc); + } else if (comm->dst_proc == process) { + XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state, + comm->src_proc, comm->dst_proc); comm->dst_proc = nullptr; if (comm->detached && comm->src_proc != nullptr) { /* the comm will be freed right now, remove it from the sender */ 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); + xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get()); } process->comms.pop_front(); - synchro = static_cast(process->comms.front()); + synchro = process->comms.front(); + comm->cancel(); } XBT_DEBUG("%p should not be run anymore",process); @@ -183,7 +175,7 @@ static int dying_daemon(void* exit_status, void* data) /** This process will be terminated automatically when the last non-daemon process finishes */ void ActorImpl::daemonize() { - if (!daemon) { + if (not daemon) { daemon = true; simix_global->daemons.push_back(this); SIMIX_process_on_exit(this, dying_daemon, this); @@ -205,10 +197,10 @@ void create_maestro(std::function code) maestro->name = ""; maestro->data = nullptr; - if (!code) { + if (not code) { maestro->context = SIMIX_context_new(std::function(), nullptr, maestro); } else { - if (!simix_global) + if (not simix_global) xbt_die("simix is not initialized, please call MSG_init first"); maestro->context = simix_global->context_factory->create_maestro(code, maestro); @@ -283,7 +275,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v if (host->extension() == nullptr) host->extension_set(new simgrid::simix::Host()); - /* Add the process to it's host process list */ + /* Add the process to its host process list */ xbt_swag_insert(process, host->extension()->process_list); XBT_DEBUG("Start context '%s'", process->name.c_str()); @@ -292,6 +284,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v simix_global->process_list[process->pid] = process; XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); + intrusive_ptr_add_ref(process); /* Tracing the process creation */ TRACE_msg_process_create(process->cname(), process->pid, process->host); @@ -340,7 +333,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn process->code = nullptr; XBT_VERB("Create context %s", process->name.c_str()); - if (!simix_global) + if (not simix_global) xbt_die("simix is not initialized, please call MSG_init first"); process->context = simix_global->context_factory->attach( simix_global->cleanup_process_function, process); @@ -360,7 +353,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn TRACE_msg_process_create(process->cname(), process->pid, process->host); auto context = dynamic_cast(process->context); - if (!context) + if (not context) xbt_die("Not a suitable context"); context->attach_start(); @@ -370,7 +363,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn void SIMIX_process_detach() { auto context = dynamic_cast(SIMIX_context_self()); - if (!context) + if (not context) xbt_die("Not a suitable context"); simix_global->cleanup_process_function(context->process()); @@ -426,36 +419,33 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { process->exception = nullptr; /* destroy the blocking synchro if any */ - if (process->waiting_synchro) { - - simgrid::kernel::activity::Exec *exec = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Comm *comm = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Sleep *sleep = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Raw *raw = dynamic_cast(process->waiting_synchro); - simgrid::kernel::activity::Io *io = dynamic_cast(process->waiting_synchro); + if (process->waiting_synchro != nullptr) { + + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::RawImplPtr raw = + boost::dynamic_pointer_cast(process->waiting_synchro); + simgrid::kernel::activity::IoImplPtr io = + boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { - exec->unref(); } else if (comm != nullptr) { process->comms.remove(process->waiting_synchro); comm->cancel(); - // Remove first occurrence of &process->simcall: - auto i = boost::range::find( - process->waiting_synchro->simcalls, - &process->simcall); + auto i = boost::range::find(process->waiting_synchro->simcalls, &process->simcall); if (i != process->waiting_synchro->simcalls.end()) process->waiting_synchro->simcalls.remove(&process->simcall); - - comm->unref(); - } else if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); } else if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); - delete process->waiting_synchro; } else if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); @@ -470,7 +460,7 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { process->waiting_synchro = nullptr; } - if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) { + if (not xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) { XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); } @@ -492,32 +482,37 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const /* cancel the blocking synchro if any */ if (process->waiting_synchro) { - simgrid::kernel::activity::Exec *exec = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { SIMIX_execution_cancel(process->waiting_synchro); } - simgrid::kernel::activity::Comm *comm = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(process->waiting_synchro); if (comm != nullptr) { process->comms.remove(comm); comm->cancel(); } - simgrid::kernel::activity::Sleep *sleep = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(process->waiting_synchro); if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); - if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) { + if (not xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) { XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); } } - simgrid::kernel::activity::Raw *raw = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::RawImplPtr raw = + boost::dynamic_pointer_cast(process->waiting_synchro); if (raw != nullptr) { SIMIX_synchro_stop_waiting(process, &process->simcall); } - simgrid::kernel::activity::Io *io = dynamic_cast(process->waiting_synchro); + simgrid::kernel::activity::IoImplPtr io = + boost::dynamic_pointer_cast(process->waiting_synchro); if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); } @@ -606,7 +601,7 @@ void SIMIX_process_resume(smx_actor_t process) return; } - if (!process->suspended) + if (not process->suspended) return; process->suspended = 0; @@ -638,7 +633,7 @@ void* SIMIX_process_self_get_data() { smx_actor_t self = SIMIX_process_self(); - if (!self) { + if (not self) { return nullptr; } return self->data; @@ -698,13 +693,14 @@ 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, smx_activity_t synchro){ - simgrid::kernel::activity::Sleep *sleep = static_cast(synchro); +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 (!sleep->simcalls.empty()) { + while (not sleep->simcalls.empty()) { smx_simcall_t simcall = sleep->simcalls.front(); sleep->simcalls.pop_front(); simcall_process_sleep__set__result(simcall, SIMIX_DONE); @@ -720,7 +716,6 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_activ sleep->surf_sleep->unref(); sleep->surf_sleep = nullptr; } - sleep->unref(); // intrusive_ptr_release(process); // FIXME: We are leaking here. See comment in SIMIX_process_join() return 0; } @@ -728,14 +723,14 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_activ smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout) { smx_activity_t res = SIMIX_process_sleep(issuer, timeout); - static_cast(res)->ref(); + 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, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res); + SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, &*res); return res; } @@ -759,9 +754,9 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) if (host->isOff()) THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->cname()); - simgrid::kernel::activity::Sleep *synchro = new simgrid::kernel::activity::Sleep(); + simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); synchro->host = host; - synchro->surf_sleep = host->pimpl_cpu->sleep(duration); + synchro->surf_sleep = host->pimpl_cpu->sleep(duration); synchro->surf_sleep->setData(synchro); XBT_DEBUG("Create sleep synchronization %p", synchro); @@ -770,13 +765,13 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) void SIMIX_process_sleep_destroy(smx_activity_t synchro) { - XBT_DEBUG("Destroy synchro %p", synchro); - simgrid::kernel::activity::Sleep *sleep = static_cast(synchro); + XBT_DEBUG("Destroy sleep synchro %p", synchro.get()); + simgrid::kernel::activity::SleepImplPtr sleep = + boost::dynamic_pointer_cast(synchro); if (sleep->surf_sleep) { sleep->surf_sleep->unref(); sleep->surf_sleep = nullptr; - sleep->unref(); } } @@ -885,7 +880,7 @@ xbt_dynar_t SIMIX_processes_as_dynar() { 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 (!process->on_exit.empty()) { + while (not process->on_exit.empty()) { exit_fun = process->on_exit.back(); (exit_fun.fun)((void*)exit_status, exit_fun.arg); process->on_exit.pop_back();