X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d68a0ac239494f0a1c7f21b7c195f453ee7a31eb..5bc3597e1513c7b94497ae0ea819e5fa2e28058a:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index d105dffe43..49d14cbada 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -5,12 +5,12 @@ #include #include +#include #include #include #include -#include "xbt/dict.h" #include "xbt/ex.hpp" #include "xbt/functional.hpp" #include "xbt/log.h" @@ -31,28 +31,13 @@ #include "src/surf/surf_interface.hpp" #ifdef HAVE_SMPI -#include "src/smpi/private.h" +#include "src/smpi/include/private.hpp" #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); 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. * @@ -81,20 +66,24 @@ 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) + if (process->kill_timer != nullptr) { SIMIX_timer_remove(process->kill_timer); + process->kill_timer = nullptr; + } xbt_os_mutex_acquire(simix_global->mutex); /* cancel non-blocking communications */ - smx_activity_t synchro = static_cast(process->comms.front()); while (not process->comms.empty()) { + smx_activity_t synchro = process->comms.front(); + process->comms.pop_front(); simgrid::kernel::activity::CommImplPtr comm = boost::static_pointer_cast(synchro); @@ -102,18 +91,13 @@ void SIMIX_process_cleanup(smx_actor_t process) * because src_proc or dst_proc would be an invalid pointer */ 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); + 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) { @@ -121,10 +105,8 @@ void SIMIX_process_cleanup(smx_actor_t process) comm->src_proc->comms.remove(comm); } } 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()); comm->cancel(); } @@ -160,7 +142,6 @@ namespace simix { ActorImpl::~ActorImpl() { delete this->context; - xbt_dict_free(&this->properties); } static int dying_daemon(void* exit_status, void* data) @@ -186,10 +167,88 @@ void ActorImpl::daemonize() } } -/** Whether this process is daemonized */ -bool ActorImpl::isDaemon() +simgrid::s4u::Actor* ActorImpl::restart() +{ + XBT_DEBUG("Restarting process %s on %s", cname(), host->getCname()); + + // retrieve the arguments of the old process + // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? + simgrid::simix::ProcessArg arg; + arg.name = name; + arg.code = code; + arg.host = host; + arg.kill_time = SIMIX_timer_get_date(kill_timer); + arg.data = userdata; + arg.properties = nullptr; + arg.auto_restart = auto_restart; + + // kill the old process + SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self()); + + // 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.get(), nullptr); + if (arg.kill_time >= 0) + simcall_process_set_kill_time(actor, arg.kill_time); + if (arg.auto_restart) + actor->auto_restart = arg.auto_restart; + + return actor->ciface(); +} + +smx_activity_t ActorImpl::suspend(ActorImpl* issuer) +{ + if (suspended) { + XBT_DEBUG("Actor '%s' is already suspended", name.c_str()); + return nullptr; + } + + suspended = 1; + + /* If we are suspending another actor that is waiting on a sync, suspend its synchronization. */ + if (this != issuer) { + if (waiting_synchro) + waiting_synchro->suspend(); + /* If the other actor is not waiting, its suspension is delayed to when the actor is rescheduled. */ + + return nullptr; + } else { + return SIMIX_execution_start(this, "suspend", 0.0, 1.0, 0.0); + } +} + +void ActorImpl::resume() { - return daemon; + XBT_IN("process = %p", this); + + if (context->iwannadie) { + XBT_VERB("Ignoring request to suspend an actor that is currently dying."); + return; + } + + if (not suspended) + return; + suspended = 0; + + /* resume the synchronization that was blocking the resumed actor. */ + if (waiting_synchro) + waiting_synchro->resume(); + + XBT_OUT(); +} + +smx_activity_t ActorImpl::sleep(double duration) +{ + if (host->isOff()) + THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->getCname()); + + simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); + synchro->host = host; + synchro->surf_sleep = host->pimpl_cpu->sleep(duration); + synchro->surf_sleep->setData(synchro); + XBT_DEBUG("Create sleep synchronization %p", synchro); + + return synchro; } void create_maestro(std::function code) @@ -199,15 +258,14 @@ void create_maestro(std::function code) maestro = new simgrid::simix::ActorImpl(); maestro->pid = simix_process_maxpid++; maestro->name = ""; - maestro->data = nullptr; + maestro->userdata = nullptr; if (not code) { maestro->context = SIMIX_context_new(std::function(), nullptr, maestro); } else { 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); + maestro->context = simix_global->context_factory->create_maestro(code, maestro); } maestro->simcall.issuer = maestro; @@ -233,13 +291,13 @@ void SIMIX_maestro_create(void (*code)(void*), void* data) * \return the process created */ smx_actor_t SIMIX_process_create(const char* name, std::function code, void* data, simgrid::s4u::Host* host, - xbt_dict_t properties, smx_actor_t parent_process) + std::map* 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; } @@ -250,7 +308,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v process->pid = simix_process_maxpid++; process->name = simgrid::xbt::string(name); process->host = host; - process->data = data; + process->userdata = data; process->simcall.issuer = process; if (parent_process != nullptr) { @@ -259,9 +317,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 @@ -273,21 +331,24 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v process->context = SIMIX_context_new(std::move(code), simix_global->cleanup_process_function, process); /* Add properties */ - process->properties = properties; + if (properties != nullptr) + for (auto const& kv : *properties) + process->setProperty(kv.first, kv.second); /* Make sure that the process is initialized for simix, in case we are called from the Host::onCreation signal */ 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_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), 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); @@ -295,8 +356,8 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v return process; } -smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname, xbt_dict_t properties, - smx_actor_t parent_process) +smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname, + std::map* properties, smx_actor_t parent_process) { // This is mostly a copy/paste from SIMIX_process_new(), // it'd be nice to share some code between those two functions. @@ -305,8 +366,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn XBT_DEBUG("Attach process %s on host '%s'", name, hostname); if (host->isOff()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", - name, hostname); + XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname); return nullptr; } @@ -315,7 +375,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn process->pid = simix_process_maxpid++; process->name = std::string(name); process->host = host; - process->data = data; + process->userdata = data; process->simcall.issuer = process; if (parent_process != nullptr) { @@ -324,9 +384,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 @@ -338,19 +398,20 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn XBT_VERB("Create context %s", process->name.c_str()); 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); + process->context = simix_global->context_factory->attach(simix_global->cleanup_process_function, process); /* Add properties */ - process->properties = properties; + if (properties != nullptr) + for (auto const& kv : *properties) + process->setProperty(kv.first, kv.second); /* Add the process to it's host process list */ xbt_swag_insert(process, host->extension()->process_list); /* 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_dynar_push_as(simix_global->process_to_run, smx_actor_t, process); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->getCname()); + simix_global->process_to_run.push_back(process); /* Tracing the process creation */ TRACE_msg_process_create(process->cname(), process->pid, process->host); @@ -369,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; } /** @@ -394,15 +449,10 @@ void SIMIX_process_runall() { SIMIX_context_runall(); - xbt_dynar_t tmp = simix_global->process_that_ran; - simix_global->process_that_ran = simix_global->process_to_run; - simix_global->process_to_run = tmp; - xbt_dynar_reset(simix_global->process_to_run); + simix_global->process_to_run.swap(simix_global->process_that_ran); + simix_global->process_to_run.clear(); } -void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_actor_t process) { - SIMIX_process_kill(process, simcall->issuer); -} /** * \brief Internal function to kill a SIMIX process. * @@ -414,7 +464,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; @@ -422,7 +472,7 @@ 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) { + if (process->waiting_synchro != nullptr) { simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(process->waiting_synchro); @@ -436,8 +486,7 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { 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(); @@ -445,30 +494,25 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { 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); - process->waiting_synchro->unref(); } else if (io != nullptr) { SIMIX_io_destroy(process->waiting_synchro); + } else { + 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 (not xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) { + if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), process) == + end(simix_global->process_to_run) && + 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); + simix_global->process_to_run.push_back(process); } } @@ -483,16 +527,15 @@ 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::ExecImplPtr exec = boost::dynamic_pointer_cast(process->waiting_synchro); - if (exec != nullptr) { - SIMIX_execution_cancel(process->waiting_synchro); - } + if (exec != nullptr && exec->surf_exec) + exec->surf_exec->cancel(); simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(process->waiting_synchro); @@ -505,9 +548,11 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const boost::dynamic_pointer_cast(process->waiting_synchro); if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); - if (not xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) { + if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), process) == + end(simix_global->process_to_run) && + 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); + simix_global->process_to_run.push_back(process); } } @@ -536,21 +581,12 @@ void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid) { */ void SIMIX_process_killall(smx_actor_t issuer, int reset_pid) { - for (auto kv : simix_global->process_list) + for (auto const& kv : simix_global->process_list) if (kv.second != issuer) SIMIX_process_kill(kv.second, issuer); if (reset_pid > 0) simix_process_maxpid = reset_pid; - - SIMIX_context_runall(); - - 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) @@ -561,10 +597,9 @@ 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); + smx_activity_t sync_suspend = process->suspend(simcall->issuer); if (process != simcall->issuer) { SIMIX_simcall_answer(simcall); @@ -576,48 +611,6 @@ void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process) /* If we are suspending ourselves, then just do not finish the simcall now */ } -smx_activity_t SIMIX_process_suspend(smx_actor_t process, smx_actor_t issuer) -{ - if (process->suspended) { - XBT_DEBUG("Process '%s' is already suspended", process->name.c_str()); - return nullptr; - } - - process->suspended = 1; - - /* If we are suspending another process that is waiting on a sync, suspend its synchronization. */ - if (process != issuer) { - - if (process->waiting_synchro) - process->waiting_synchro->suspend(); - /* If the other process is not waiting, its suspension is delayed to when the process is rescheduled. */ - - return nullptr; - } else { - return SIMIX_execution_start(process, "suspend", 0.0, 1.0, 0.0); - } -} - -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 (not 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,14 +620,6 @@ 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(); @@ -642,20 +627,14 @@ void* SIMIX_process_self_get_data() if (not self) { return nullptr; } - return self->data; + return self->getUserData(); } void SIMIX_process_self_set_data(void *data) { - smx_actor_t self = SIMIX_process_self(); - - SIMIX_process_set_data(self, data); + SIMIX_process_self()->setUserData(data); } -void SIMIX_process_set_data(smx_actor_t process, void *data) -{ - process->data = data; -} /* needs to be public and without simcall because it is called by exceptions and logging events */ @@ -670,22 +649,12 @@ const char* SIMIX_process_self_get_name() { smx_actor_t SIMIX_process_get_by_name(const char* name) { - for (auto kv : simix_global->process_list) + for (auto const& kv : simix_global->process_list) if (kv.second->name == name) return kv.second; 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,45 +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; - } - sleep->unref(); - // 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 = SIMIX_process_sleep(issuer, timeout); - (&*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); + smx_activity_t res = issuer->sleep(timeout); + intrusive_ptr_add_ref(res.get()); + SIMIX_process_on_exit(process, + [](void*, void* 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.get()); return res; } @@ -749,45 +692,27 @@ void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration) SIMIX_simcall_answer(simcall); return; } - smx_activity_t sync = SIMIX_process_sleep(simcall->issuer, duration); + smx_activity_t sync = simcall->issuer->sleep(duration); sync->simcalls.push_back(simcall); simcall->issuer->waiting_synchro = sync; } -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()); - - simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); - synchro->host = host; - synchro->surf_sleep = host->pimpl_cpu->sleep(duration); - synchro->surf_sleep->setData(synchro); - XBT_DEBUG("Create sleep synchronization %p", synchro); - - return synchro; -} - void SIMIX_process_sleep_destroy(smx_activity_t synchro) { - XBT_DEBUG("Destroy synchro %p", 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(); } } /** * \brief Calling this function makes the process to yield. * - * Only the current process can call this function, giving back the control to - * maestro. + * Only the current process can call this function, giving back the control to maestro. * * \param self the current process */ @@ -813,13 +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->data, - SIMIX_timer_get_date(self->kill_timer), - self->properties, + SIMIX_host_add_auto_restart_process(self->host, self->cname(), 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->cname()); + XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->getCname()); self->context->stop(); } @@ -827,7 +750,7 @@ void SIMIX_process_yield(smx_actor_t self) XBT_DEBUG("Hey! I'm suspended."); xbt_assert(self->exception != nullptr, "Gasp! This exception may be lost by subsequent calls."); self->suspended = 0; - SIMIX_process_suspend(self, self); + self->suspend(self); } if (self->exception != nullptr) { @@ -849,49 +772,25 @@ 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. - */ -xbt_dynar_t SIMIX_process_get_runnable() +/** @brief Returns the list of processes to run. */ +const std::vector& simgrid::simix::process_get_runnable() { return simix_global->process_to_run; } -/** - * \brief Returns the process from PID. - */ +/** @brief Returns the process from 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; - return simix_global->process_list.at(PID); -} - -/** @brief returns a dynar containing all currently existing processes */ -xbt_dynar_t SIMIX_processes_as_dynar() { - xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t),nullptr); - for (auto kv : simix_global->process_list) { - smx_actor_t proc = kv.second; - xbt_dynar_push(res,&proc); - } - return res; + auto process = simix_global->process_list.find(PID); + return process == simix_global->process_list.end() ? nullptr : process->second; } 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 (not process->on_exit.empty()) { - exit_fun = process->on_exit.back(); - (exit_fun.fun)((void*)exit_status, exit_fun.arg); + 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); } } @@ -905,49 +804,13 @@ void SIMIX_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *d /** * \brief Sets the auto-restart status of the process. - * If set to 1, the process will be automatically restarted when its host - * comes back. + * If set to 1, the process will be automatically restarted when its host comes back. */ void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart) { process->auto_restart = auto_restart; } -smx_actor_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_actor_t process) { - return SIMIX_process_restart(process, simcall->issuer); -} /** @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()); - - //retrieve the arguments of the old process - //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? - simgrid::simix::ProcessArg arg; - arg.name = process->name; - arg.code = process->code; - arg.host = process->host; - arg.kill_time = SIMIX_timer_get_date(process->kill_timer); - arg.data = process->data; - arg.properties = nullptr; - arg.auto_restart = process->auto_restart; - - //kill the old process - SIMIX_process_kill(process, issuer); - - //start the new process - smx_actor_t actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host, - arg.properties, nullptr); - if (arg.kill_time >= 0) - simcall_process_set_kill_time(actor, arg.kill_time); - if (arg.auto_restart) - simcall_process_auto_restart_set(actor, arg.auto_restart); - - 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. @@ -956,7 +819,8 @@ void SIMIX_segment_index_set(smx_actor_t proc, int index){ * * \param name a name for the process. It is for user-level information and can be nullptr. * \param code the main function of the process - * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be nullptr. + * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can + * be nullptr. * It can be retrieved with the function \ref simcall_process_get_data. * \param host where the new agent is executed. * \param kill_time time when the process is killed @@ -965,8 +829,8 @@ 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. */ -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) +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, std::map* properties) { if (name == nullptr) name = ""; @@ -979,7 +843,7 @@ smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* } smx_actor_t simcall_process_create(const char* name, std::function code, void* data, sg_host_t host, - xbt_dict_t properties) + std::map* properties) { if (name == nullptr) name = "";