-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. 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. */
-#include <exception>
-#include <functional>
-#include <map>
-#include <string>
-#include <utility>
-
-#include <boost/range/algorithm.hpp>
-
-#include "xbt/ex.hpp"
-#include "xbt/functional.hpp"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-#include "xbt/utility.hpp"
-
-#include "simgrid/s4u/Host.hpp"
-
#include "mc/mc.h"
-
#include "smx_private.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.hpp"
-#include "src/msg/msg_private.hpp"
+#include "src/simix/smx_host_private.hpp"
+#include "src/simix/smx_io_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
+#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "xbt/ex.hpp"
#ifdef HAVE_SMPI
#include "src/smpi/include/private.hpp"
#endif
+#include <boost/range/algorithm.hpp>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
unsigned long simix_process_maxpid = 0;
*/
void SIMIX_process_cleanup(smx_actor_t process)
{
- XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->name.c_str(), process,
+ XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
process->waiting_synchro.get());
- process->finished = true;
+ process->finished_ = true;
SIMIX_process_on_exit_runall(process);
/* Unregister from the kill timer if any */
if (comm->src_proc == process) {
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->detached, (int)comm->state_, comm->src_proc, comm->dst_proc);
comm->src_proc = nullptr;
} 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,
+ 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;
}
XBT_DEBUG("%p should not be run anymore",process);
- simix_global->process_list.erase(process->pid);
- if (process->host && process->host_process_list_hook.is_linked())
- simgrid::xbt::intrusive_erase(process->host->extension<simgrid::simix::Host>()->process_list, *process);
+ simix_global->process_list.erase(process->pid_);
+ if (process->host_ && process->host_process_list_hook.is_linked())
+ simgrid::xbt::intrusive_erase(process->host_->pimpl_->process_list_, *process);
if (not process->smx_destroy_list_hook.is_linked()) {
#if SIMGRID_HAVE_MC
xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, process);
#endif
simix_global->process_to_destroy.push_back(*process);
}
- process->context->iwannadie = 0;
+ process->context_->iwannadie = 0;
xbt_os_mutex_release(simix_global->mutex);
}
}
namespace simgrid {
-namespace simix {
+
+namespace kernel {
+namespace actor {
ActorImpl::~ActorImpl()
{
- delete this->context;
+ 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()
{
- if (not daemon) {
- daemon = true;
+ if (not daemon_) {
+ daemon_ = true;
simix_global->daemons.push_back(this);
SIMIX_process_on_exit(this, dying_daemon, this);
}
simgrid::s4u::Actor* ActorImpl::restart()
{
- XBT_DEBUG("Restarting process %s on %s", getCname(), host->getCname());
+ XBT_DEBUG("Restarting process %s on %s", get_cname(), host_->get_cname());
// 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;
+ simgrid::kernel::actor::ProcessArg arg = ProcessArg(host_, this);
// 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;
+ simcall_process_set_kill_time(actor, arg.kill_time);
+ actor->set_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());
+ if (suspended_) {
+ XBT_DEBUG("Actor '%s' is already suspended", get_cname());
return nullptr;
}
- suspended = 1;
+ suspended_ = 1;
/* If we are suspending another actor that is waiting on a sync, suspend its synchronization. */
if (this != issuer) {
return nullptr;
} else {
- return SIMIX_execution_start("suspend", 0.0, 1.0, 0.0, this->host);
+ return SIMIX_execution_start("suspend", 0.0, 1.0, 0.0, this->host_);
}
}
{
XBT_IN("process = %p", this);
- if (context->iwannadie) {
+ if (context_->iwannadie) {
XBT_VERB("Ignoring request to suspend an actor that is currently dying.");
return;
}
- if (not suspended)
+ if (not suspended_)
return;
- suspended = 0;
+ suspended_ = 0;
/* resume the synchronization that was blocking the resumed actor. */
if (waiting_synchro)
smx_activity_t ActorImpl::sleep(double duration)
{
- if (host->isOff())
- THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->getCname());
+ if (host_->is_off())
+ THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host_->get_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);
+ synchro->host = host_;
+ synchro->surf_sleep = host_->pimpl_cpu->sleep(duration);
+ synchro->surf_sleep->set_data(synchro);
XBT_DEBUG("Create sleep synchronization %p", synchro);
return synchro;
}
-void create_maestro(std::function<void()> code)
+void create_maestro(simgrid::simix::ActorCode code)
{
smx_actor_t maestro = nullptr;
/* Create maestro process and initialize it */
- maestro = new simgrid::simix::ActorImpl();
- maestro->pid = simix_process_maxpid++;
- maestro->name = "";
- maestro->userdata = nullptr;
+ maestro = new simgrid::kernel::actor::ActorImpl();
+ maestro->pid_ = simix_process_maxpid++;
+ maestro->name_ = "";
+ maestro->set_user_data(nullptr);
if (not code) {
- maestro->context = SIMIX_context_new(std::function<void()>(), nullptr, maestro);
+ maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), 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;
simix_global->maestro_process = maestro;
}
+} // namespace actor
}
}
/** @brief Creates and runs the maestro process */
void SIMIX_maestro_create(void (*code)(void*), void* data)
{
- simgrid::simix::create_maestro(std::bind(code, data));
+ simgrid::kernel::actor::create_maestro(std::bind(code, data));
}
/**
*
* \return the process created
*/
-smx_actor_t SIMIX_process_create(const char* name, std::function<void()> code, void* data, simgrid::s4u::Host* host,
- std::map<std::string, std::string>* properties, smx_actor_t parent_process)
+smx_actor_t SIMIX_process_create(std::string name, simgrid::simix::ActorCode code, void* data, simgrid::s4u::Host* host,
+ std::unordered_map<std::string, std::string>* properties, smx_actor_t parent_process)
{
- XBT_DEBUG("Start process %s on host '%s'", name, host->getCname());
+ XBT_DEBUG("Start process %s on host '%s'", name.c_str(), host->get_cname());
- if (host->isOff()) {
- XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->getCname());
+ if (host->is_off()) {
+ XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
return nullptr;
}
- smx_actor_t process = new simgrid::simix::ActorImpl();
+ smx_actor_t process = new simgrid::kernel::actor::ActorImpl();
xbt_assert(code && host != nullptr, "Invalid parameters");
/* Process data */
- process->pid = simix_process_maxpid++;
- process->name = simgrid::xbt::string(name);
- process->host = host;
- process->userdata = data;
+ process->pid_ = simix_process_maxpid++;
+ process->name_ = simgrid::xbt::string(name);
+ process->host_ = host;
+ process->set_user_data(data);
process->simcall.issuer = process;
if (parent_process != nullptr) {
- process->ppid = parent_process->pid;
-/* SMPI process have their own data segment and each other inherit from their father */
-#if HAVE_SMPI
- if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {
- if (parent_process->pid != 0) {
- process->segment_index = parent_process->segment_index;
- } else {
- process->segment_index = process->pid - 1;
- }
- }
-#endif
+ process->ppid_ = parent_process->pid_;
}
process->code = code;
- XBT_VERB("Create context %s", process->name.c_str());
- process->context = SIMIX_context_new(std::move(code), simix_global->cleanup_process_function, process);
+ XBT_VERB("Create context %s", process->get_cname());
+ process->context_ = SIMIX_context_new(std::move(code), simix_global->cleanup_process_function, process);
/* Add 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<simgrid::simix::Host>() == nullptr)
- host->extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
+ process->set_property(kv.first, kv.second);
- /* Add the process to its host process list */
- host->extension<simgrid::simix::Host>()->process_list.push_back(*process);
+ /* Add the process to its host's process list */
+ host->pimpl_->process_list_.push_back(*process);
- XBT_DEBUG("Start context '%s'", process->name.c_str());
+ XBT_DEBUG("Start context '%s'", process->get_cname());
/* 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->getCname(), host->getCname());
+ simix_global->process_list[process->pid_] = process;
+ XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname());
simix_global->process_to_run.push_back(process);
intrusive_ptr_add_ref(process);
- /* Tracing the process creation */
- TRACE_msg_process_create(process->getName(), process->pid, process->host);
+ /* The onCreation() signal must be delayed until there, where the pid and everything is set */
+ simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes
+ simgrid::s4u::Actor::on_creation(tmp);
return process;
}
smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
- std::map<std::string, std::string>* properties, smx_actor_t parent_process)
+ std::unordered_map<std::string, std::string>* 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.
sg_host_t host = sg_host_by_name(hostname);
XBT_DEBUG("Attach process %s on host '%s'", name, hostname);
- if (host->isOff()) {
+ if (host->is_off()) {
XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname);
return nullptr;
}
- smx_actor_t process = new simgrid::simix::ActorImpl();
+ smx_actor_t process = new simgrid::kernel::actor::ActorImpl();
/* Process data */
- process->pid = simix_process_maxpid++;
- process->name = std::string(name);
- process->host = host;
- process->userdata = data;
+ process->pid_ = simix_process_maxpid++;
+ process->name_ = std::string(name);
+ process->host_ = host;
+ process->set_user_data(data);
process->simcall.issuer = process;
if (parent_process != nullptr) {
- process->ppid = parent_process->pid;
- /* SMPI process have their own data segment and each other inherit from their father */
-#if HAVE_SMPI
- if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {
- if (parent_process->pid != 0) {
- process->segment_index = parent_process->segment_index;
- } else {
- process->segment_index = process->pid - 1;
- }
- }
-#endif
+ process->ppid_ = parent_process->pid_;
}
/* Process data for auto-restart */
process->code = nullptr;
- XBT_VERB("Create context %s", process->name.c_str());
+ XBT_VERB("Create context %s", process->get_cname());
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 */
if (properties != nullptr)
for (auto const& kv : *properties)
- process->setProperty(kv.first, kv.second);
+ process->set_property(kv.first, kv.second);
/* Add the process to it's host process list */
- host->extension<simgrid::simix::Host>()->process_list.push_back(*process);
+ host->pimpl_->process_list_.push_back(*process);
/* 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->getCname(), host->getCname());
+ simix_global->process_list[process->pid_] = process;
+ XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname());
simix_global->process_to_run.push_back(process);
+ intrusive_ptr_add_ref(process);
- /* Tracing the process creation */
- TRACE_msg_process_create(process->getName(), process->pid, process->host);
-
- auto context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context);
+ auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context_);
if (not context)
xbt_die("Not a suitable context");
context->attach_start();
+
+ /* The onCreation() signal must be delayed until there, where the pid and everything is set */
+ simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes
+ simgrid::s4u::Actor::on_creation(tmp);
+
return process;
}
void SIMIX_process_detach()
{
- auto context = dynamic_cast<simgrid::kernel::context::AttachContext*>(SIMIX_context_self());
+ auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(SIMIX_context_self());
if (not context)
xbt_die("Not a suitable context");
auto process = context->process();
simix_global->cleanup_process_function(process);
context->attach_stop();
- delete process;
}
/**
*/
void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
- if (process->finished) {
- XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->getCname(),
- process->host->getCname());
+ if (process->finished_) {
+ XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->get_cname(),
+ process->host_->get_cname());
return;
}
- XBT_DEBUG("Killing process %s@%s", process->getCname(), process->host->getCname());
+ XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(),
+ (issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), process->get_cname(),
+ process->host_->get_cname());
- process->context->iwannadie = 1;
- process->blocked = 0;
- process->suspended = 0;
+ process->context_->iwannadie = 1;
+ process->blocked_ = 0;
+ process->suspended_ = 0;
process->exception = nullptr;
/* destroy the blocking synchro if any */
boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(process->waiting_synchro);
if (exec != nullptr) {
- if (exec->surfAction_) {
- exec->surfAction_->cancel();
- exec->surfAction_->unref();
- exec->surfAction_ = nullptr;
+ if (exec->surf_action_) {
+ exec->surf_action_->cancel();
+ exec->surf_action_->unref();
+ exec->surf_action_ = nullptr;
}
} 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);
- if (i != process->waiting_synchro->simcalls.end())
- process->waiting_synchro->simcalls.remove(&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);
} else if (sleep != nullptr) {
- SIMIX_process_sleep_destroy(process->waiting_synchro);
-
+ if (sleep->surf_sleep)
+ sleep->surf_sleep->cancel();
+ sleep->post();
} else if (raw != nullptr) {
SIMIX_synchro_stop_waiting(process, &process->simcall);
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_DEBUG("Inserting %s in the to_run list", process->get_cname());
simix_global->process_to_run.push_back(process);
}
}
void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const char *msg) {
SMX_EXCEPTION(process, cat, value, msg);
- if (process->suspended)
+ if (process->suspended_)
process->resume();
/* cancel the blocking synchro if any */
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(process->waiting_synchro);
- if (exec != nullptr && exec->surfAction_)
- exec->surfAction_->cancel();
+ if (exec != nullptr && exec->surf_action_)
+ exec->surf_action_->cancel();
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(process->waiting_synchro);
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_DEBUG("Inserting %s in the to_run list", process->get_cname());
simix_global->process_to_run.push_back(process);
}
}
}
-void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid) {
- SIMIX_process_killall(simcall->issuer, reset_pid);
-}
/**
* \brief Kills all running processes.
* \param issuer this one will not be killed
*/
-void SIMIX_process_killall(smx_actor_t issuer, int reset_pid)
+void SIMIX_process_killall(smx_actor_t issuer)
{
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;
}
-void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest)
+void SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest)
{
- xbt_assert((process != nullptr), "Invalid parameters");
- simgrid::xbt::intrusive_erase(process->host->extension<simgrid::simix::Host>()->process_list, *process);
- process->host = dest;
- dest->extension<simgrid::simix::Host>()->process_list.push_back(*process);
+ xbt_assert((actor != nullptr), "Invalid parameters");
+ simgrid::xbt::intrusive_erase(actor->host_->pimpl_->process_list_, *actor);
+ actor->host_ = dest;
+ dest->pimpl_->process_list_.push_back(*actor);
}
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process)
if (process != simcall->issuer) {
SIMIX_simcall_answer(simcall);
} else {
- sync_suspend->simcalls.push_back(simcall);
+ sync_suspend->simcalls_.push_back(simcall);
process->waiting_synchro = sync_suspend;
process->waiting_synchro->suspend();
}
if (not self) {
return nullptr;
}
- return self->getUserData();
+ return self->get_user_data();
}
void SIMIX_process_self_set_data(void *data)
{
- SIMIX_process_self()->setUserData(data);
+ SIMIX_process_self()->set_user_data(data);
}
if (process == nullptr || process == simix_global->maestro_process)
return "maestro";
- return process->name.c_str();
-}
-
-smx_actor_t SIMIX_process_get_by_name(const char* name)
-{
- for (auto const& kv : simix_global->process_list)
- if (kv.second->name == name)
- return kv.second;
- return nullptr;
+ return process->get_cname();
}
void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout)
{
- if (process->finished) {
+ if (process->finished_) {
// The joined process is already finished, just wake up the issuer process right away
simcall_process_sleep__set__result(simcall, SIMIX_DONE);
SIMIX_simcall_answer(simcall);
return;
}
smx_activity_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
- sync->simcalls.push_back(simcall);
+ sync->simcalls_.push_back(simcall);
simcall->issuer->waiting_synchro = sync;
}
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::surf::Action::State::done);
+ sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED);
intrusive_ptr_release(sleep);
- return 0;
},
res.get());
return res;
return;
}
smx_activity_t sync = simcall->issuer->sleep(duration);
- sync->simcalls.push_back(simcall);
+ sync->simcalls_.push_back(simcall);
simcall->issuer->waiting_synchro = sync;
}
*/
void SIMIX_process_yield(smx_actor_t self)
{
- XBT_DEBUG("Yield actor '%s'", self->getCname());
+ XBT_DEBUG("Yield actor '%s'", self->get_cname());
/* Go into sleep and return control to maestro */
- self->context->suspend();
+ self->context_->suspend();
/* Ok, maestro returned control to us */
- XBT_DEBUG("Control returned to me: '%s'", self->name.c_str());
+ XBT_DEBUG("Control returned to me: '%s'", self->get_cname());
- if (self->new_host) {
- SIMIX_process_change_host(self, self->new_host);
- self->new_host = nullptr;
- }
-
- if (self->context->iwannadie){
+ if (self->context_->iwannadie) {
XBT_DEBUG("I wanna die!");
- self->finished = true;
+ self->finished_ = true;
/* execute the on_exit functions */
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->getCname(), self->code, self->userdata,
- SIMIX_timer_get_date(self->kill_timer), self->getProperties(),
- self->auto_restart);
+ if (self->auto_restart_ && self->host_->is_off()) {
+ SIMIX_host_add_auto_restart_process(self->host_, self);
}
- XBT_DEBUG("Process %s@%s is dead", self->getCname(), self->host->getCname());
- self->context->stop();
+ XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host_->get_cname());
+ self->context_->stop();
}
- if (self->suspended) {
+ if (self->suspended_) {
XBT_DEBUG("Hey! I'm suspended.");
xbt_assert(self->exception != nullptr, "Gasp! This exception may be lost by subsequent calls.");
- self->suspended = 0;
+ self->suspended_ = 0;
self->suspend(self);
}
std::rethrow_exception(std::move(exception));
}
- if(SMPI_switch_data_segment && self->segment_index != -1){
- SMPI_switch_data_segment(self->segment_index);
+ if (SMPI_switch_data_segment && not self->finished_) {
+ SMPI_switch_data_segment(self->iface());
}
}
-/* callback: termination */
-void SIMIX_process_exception_terminate(xbt_ex_t * e)
-{
- xbt_ex_display(e);
- xbt_abort();
-}
-
/** @brief Returns the list of processes to run. */
const std::vector<smx_actor_t>& simgrid::simix::process_get_runnable()
{
}
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;
+ simgrid::s4u::Actor::on_destruction(process->iface());
+ 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();
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 ?");
-
- s_smx_process_exit_fun_t exit_fun = {fun, data};
-
- process->on_exit.push_back(exit_fun);
+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);
}
-/**
- * \brief Sets the auto-restart status of the process.
- * 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;
+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.emplace_back(s_smx_process_exit_fun_t{fun, data});
}
/** @brief Restart a process, starting it again from the beginning. */
* \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.
- * It can be retrieved with the function \ref simcall_process_get_data.
+ * It can be retrieved with the method ActorImpl::getUserData().
* \param host where the new agent is executed.
- * \param kill_time time when the process is killed
* \param argc first argument passed to \a code
* \param argv second argument passed to \a code
* \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, std::map<std::string, std::string>* properties)
+smx_actor_t simcall_process_create(std::string name, xbt_main_func_t code, void* data, sg_host_t host, int argc,
+ char** argv, std::unordered_map<std::string, std::string>* properties)
{
- if (name == nullptr)
- name = "";
- auto wrapped_code = simgrid::xbt::wrapMain(code, argc, argv);
+ auto wrapped_code = simgrid::xbt::wrap_main(code, argc, argv);
for (int i = 0; i != argc; ++i)
xbt_free(argv[i]);
xbt_free(argv);
return res;
}
-smx_actor_t simcall_process_create(const char* name, std::function<void()> code, void* data, sg_host_t host,
- std::map<std::string, std::string>* properties)
+smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode code, void* data, sg_host_t host,
+ std::unordered_map<std::string, std::string>* properties)
{
- if (name == nullptr)
- name = "";
smx_actor_t self = SIMIX_process_self();
- return simgrid::simix::kernelImmediate([name, code, data, host, properties, self] {
+ return simgrid::simix::simcall([name, code, data, host, properties, self] {
return SIMIX_process_create(name, std::move(code), data, host, properties, self);
});
}
