X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2dba4579bf4c7f7e8cde2b36ff308645a3cc891b..7ef49c428ab0209965a09a36ab28b59789aaa4b5:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 43944d041a..79356f08b6 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,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 +#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" @@ -39,21 +38,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX unsigned long simix_process_maxpid = 0; -/** Increase the refcount for this process */ -smx_actor_t SIMIX_process_ref(smx_actor_t process) -{ - if (process != nullptr) - intrusive_ptr_add_ref(process); - return process; -} - -/** Decrease the refcount for this process */ -void SIMIX_process_unref(smx_actor_t process) -{ - if (process != nullptr) - intrusive_ptr_release(process); -} - /** * \brief Returns the current agent. * @@ -82,55 +66,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); @@ -184,17 +160,31 @@ 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); } } -/** Whether this process is daemonized */ -bool ActorImpl::isDaemon() +void ActorImpl::resume() { - return daemon; + XBT_IN("process = %p", this); + + if (context->iwannadie) { + XBT_VERB("Ignoring request to suspend a process that is currently dying."); + return; + } + + if (not suspended) + return; + suspended = 0; + + /* resume the synchronization that was blocking the resumed process. */ + if (waiting_synchro) + waiting_synchro->resume(); + + XBT_OUT(); } void create_maestro(std::function code) @@ -206,10 +196,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); @@ -241,10 +231,10 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v xbt_dict_t properties, smx_actor_t parent_process) { - XBT_DEBUG("Start process %s on host '%s'", name, host->cname()); + XBT_DEBUG("Start process %s on host '%s'", name, host->getCname()); if (host->isOff()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->cname()); + XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->getCname()); return nullptr; } @@ -264,9 +254,9 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v #if HAVE_SMPI if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { if (parent_process->pid != 0) { - SIMIX_segment_index_set(process, parent_process->segment_index); + process->segment_index = parent_process->segment_index; } else { - SIMIX_segment_index_set(process, process->pid - 1); + process->segment_index = process->pid - 1; } } #endif @@ -284,15 +274,16 @@ 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()); /* 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->cname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->getCname()); 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); @@ -329,9 +320,9 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn #if HAVE_SMPI if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { if (parent_process->pid != 0) { - SIMIX_segment_index_set(process, parent_process->segment_index); + process->segment_index = parent_process->segment_index; } else { - SIMIX_segment_index_set(process, process->pid - 1); + process->segment_index = process->pid - 1; } } #endif @@ -341,7 +332,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); @@ -354,14 +345,14 @@ 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->cname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->getCname()); xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); /* Tracing the process creation */ 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(); @@ -371,7 +362,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()); @@ -419,7 +410,7 @@ void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_actor_t process) { */ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { - XBT_DEBUG("Killing process %s@%s", process->cname(), process->host->cname()); + XBT_DEBUG("Killing process %s@%s", process->cname(), process->host->getCname()); process->context->iwannadie = 1; process->blocked = 0; @@ -427,39 +418,38 @@ 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(); - + /* Nothing to do */ } 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); + } else { + xbt_die("Unknown type of activity"); } /* @@ -471,7 +461,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); } @@ -488,37 +478,42 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const SMX_EXCEPTION(process, cat, value, msg); if (process->suspended) - SIMIX_process_resume(process); + process->resume(); /* 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); } @@ -548,11 +543,6 @@ void SIMIX_process_killall(smx_actor_t issuer, int reset_pid) SIMIX_process_empty_trash(); } -void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_actor_t process, sg_host_t dest) -{ - process->new_host = dest; -} - void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest) { xbt_assert((process != nullptr), "Invalid parameters"); @@ -561,7 +551,6 @@ void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest) xbt_swag_insert(process, dest->extension()->process_list); } - void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process) { smx_activity_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer); @@ -598,26 +587,6 @@ smx_activity_t SIMIX_process_suspend(smx_actor_t process, smx_actor_t issuer) } } -void SIMIX_process_resume(smx_actor_t process) -{ - XBT_IN("process = %p", process); - - if (process->context->iwannadie) { - XBT_VERB("Ignoring request to suspend a process that is currently dying."); - return; - } - - if (!process->suspended) - return; - process->suspended = 0; - - /* resume the synchronization that was blocking the resumed process. */ - if (process->waiting_synchro) - process->waiting_synchro->resume(); - - XBT_OUT(); -} - int SIMIX_process_get_maxpid() { return simix_process_maxpid; } @@ -627,19 +596,11 @@ int SIMIX_process_count() return simix_global->process_list.size(); } -int SIMIX_process_get_PID(smx_actor_t self) -{ - if (self == nullptr) - return 0; - else - return self->pid; -} - void* SIMIX_process_self_get_data() { smx_actor_t self = SIMIX_process_self(); - if (!self) { + if (not self) { return nullptr; } return self->data; @@ -676,16 +637,6 @@ smx_actor_t SIMIX_process_get_by_name(const char* name) return nullptr; } -int SIMIX_process_is_suspended(smx_actor_t process) -{ - return process->suspended; -} - -xbt_dict_t SIMIX_process_get_properties(smx_actor_t process) -{ - return process->properties; -} - void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout) { if (process->finished) { @@ -699,13 +650,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); @@ -721,7 +673,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; } @@ -729,14 +680,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; } @@ -758,11 +709,11 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration) sg_host_t host = process->host; if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->cname()); + THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->getCname()); - 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); @@ -771,13 +722,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(); } } @@ -817,7 +768,7 @@ void SIMIX_process_yield(smx_actor_t self) self->properties, self->auto_restart); } - XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->cname()); + XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->getCname()); self->context->stop(); } @@ -847,14 +798,6 @@ void SIMIX_process_exception_terminate(xbt_ex_t * e) xbt_abort(); } -smx_context_t SIMIX_process_get_context(smx_actor_t p) { - return p->context; -} - -void SIMIX_process_set_context(smx_actor_t p,smx_context_t c) { - p->context = c; -} - /** * \brief Returns the list of processes to run. */ @@ -866,7 +809,7 @@ xbt_dynar_t SIMIX_process_get_runnable() /** * \brief Returns the process from PID. */ -smx_actor_t SIMIX_process_from_PID(int PID) +smx_actor_t SIMIX_process_from_PID(aid_t PID) { if (simix_global->process_list.find(PID) == simix_global->process_list.end()) return nullptr; @@ -884,10 +827,9 @@ 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()) { - exit_fun = process->on_exit.back(); + 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(); } @@ -915,7 +857,7 @@ smx_actor_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_actor_t p } /** @brief Restart a process, starting it again from the beginning. */ smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) { - XBT_DEBUG("Restarting process %s on %s", process->cname(), process->host->cname()); + XBT_DEBUG("Restarting process %s on %s", process->cname(), process->host->getCname()); //retrieve the arguments of the old process //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? @@ -942,10 +884,6 @@ smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) { return actor; } -void SIMIX_segment_index_set(smx_actor_t proc, int index){ - proc->segment_index = index; -} - /** * \ingroup simix_process_management * \brief Creates and runs a new SIMIX process. @@ -963,6 +901,7 @@ void SIMIX_segment_index_set(smx_actor_t proc, int index){ * \param properties the properties of the process * \param auto_restart either it is autorestarting or not. */ +extern "C" smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc, char** argv, xbt_dict_t properties) {