-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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 "src/kernel/activity/SleepImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/AppSide.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include <boost/range/algorithm.hpp>
+#include <utility>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
*/
smx_actor_t SIMIX_process_self()
{
- simgrid::kernel::context::Context* self_context = simgrid::kernel::context::Context::self();
-
- return (self_context != nullptr) ? self_context->get_actor() : nullptr;
-}
-
-/**
- * @brief Returns whether a process has pending asynchronous communications.
- * @return true if there are asynchronous communications in this process
- * @deprecated
- */
-int SIMIX_process_has_pending_comms(smx_actor_t process)
-{
-
- return process->comms.size() > 0;
+ return simgrid::kernel::actor::ActorImpl::self();
}
namespace simgrid {
return maxpid;
}
-ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this)
+ActorImpl* ActorImpl::self()
{
- pid_ = maxpid++;
- simcall.issuer = this;
+ const context::Context* self_context = context::Context::self();
+
+ return (self_context != nullptr) ? self_context->get_actor() : nullptr;
+}
+
+ActorImpl::ActorImpl(xbt::string name, s4u::Host* host) : host_(host), name_(std::move(name)), piface_(this)
+{
+ pid_ = maxpid++;
+ simcall_.issuer_ = this;
+ stacksize_ = smx_context_stack_size;
}
ActorImpl::~ActorImpl()
{
- if (simix_global != nullptr && this != simix_global->maestro_process) {
- if (context_.get() != nullptr) /* the actor was not start()ed yet. This happens if its host was initially off */
- context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); });
- if (context_.get() != nullptr)
- context_->iwannadie = true;
- }
+ if (simix_global != nullptr && this != simix_global->maestro_)
+ s4u::Actor::on_destruction(*get_ciface());
}
/* Become an actor in the simulation
{
// This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions.
- XBT_DEBUG("Attach process %s on host '%s'", name.c_str(), host->get_cname());
+ XBT_DEBUG("Attach actor %s on host '%s'", name.c_str(), host->get_cname());
if (not host->is_on()) {
- XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
- throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
+ XBT_WARN("Cannot attach actor '%s' on failed host '%s'", name.c_str(), host->get_cname());
+ throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
}
- ActorImpl* actor = new ActorImpl(xbt::string(name), host);
+ auto* actor = new ActorImpl(xbt::string(name), host);
/* Actor data */
actor->set_user_data(data);
actor->code_ = nullptr;
if (properties != nullptr)
actor->set_properties(*properties);
- /* Add the process to it's host process list */
- host->pimpl_->process_list_.push_back(*actor);
+ /* Add the actor to it's host actor list */
+ host->pimpl_->add_actor(actor);
- /* Now insert it in the global process list and in the process to run list */
+ /* Now insert it in the global actor list and in the actors to run list */
simix_global->process_list[actor->get_pid()] = actor;
XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname());
simix_global->actors_to_run.push_back(actor);
intrusive_ptr_add_ref(actor);
- auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(actor->context_.get());
+ auto* context = dynamic_cast<context::AttachContext*>(actor->context_.get());
xbt_assert(nullptr != context, "Not a suitable context");
context->attach_start();
/* The on_creation() signal must be delayed until there, where the pid and everything is set */
- simgrid::s4u::Actor::on_creation(*actor->ciface());
+ s4u::Actor::on_creation(*actor->get_ciface());
return ActorImplPtr(actor);
}
context->attach_stop();
}
+void ActorImpl::cleanup_from_simix()
+{
+ const std::lock_guard<std::mutex> lock(simix_global->mutex);
+ simix_global->process_list.erase(pid_);
+ if (host_ && host_actor_list_hook.is_linked())
+ host_->pimpl_->remove_actor(this);
+ if (not smx_destroy_list_hook.is_linked()) {
+#if SIMGRID_HAVE_MC
+ xbt_dynar_push_as(simix_global->dead_actors_vector, ActorImpl*, this);
+#endif
+ simix_global->actors_to_destroy.push_back(*this);
+ }
+}
+
void ActorImpl::cleanup()
{
finished_ = true;
if (on_exit) {
// Execute the termination callbacks
- bool failed = context_->iwannadie;
+ bool failed = context_->wannadie();
for (auto exit_fun = on_exit->crbegin(); exit_fun != on_exit->crend(); ++exit_fun)
(*exit_fun)(failed);
on_exit.reset();
undaemonize();
/* cancel non-blocking activities */
- for (auto activity : comms)
- boost::static_pointer_cast<activity::CommImpl>(activity)->cancel();
- comms.clear();
+ for (auto activity : activities_)
+ activity->cancel();
+ activities_.clear();
XBT_DEBUG("%s@%s(%ld) should not run anymore", get_cname(), get_host()->get_cname(), get_pid());
- if (this == simix_global->maestro_process) /* Do not cleanup maestro */
+ if (this == simix_global->maestro_) /* Do not cleanup maestro */
return;
- XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get());
+ XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro_.get());
- /* Unregister from the kill timer if any */
- if (kill_timer != nullptr) {
- kill_timer->remove();
- kill_timer = nullptr;
+ /* Unregister associated timers if any */
+ if (kill_timer_ != nullptr) {
+ kill_timer_->remove();
+ kill_timer_ = nullptr;
}
-
- simix_global->mutex.lock();
-
- simix_global->process_list.erase(pid_);
- if (host_ && host_process_list_hook.is_linked())
- simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this);
- if (not smx_destroy_list_hook.is_linked()) {
-#if SIMGRID_HAVE_MC
- xbt_dynar_push_as(simix_global->dead_actors_vector, ActorImpl*, this);
-#endif
- simix_global->actors_to_destroy.push_back(*this);
+ if (simcall_.timeout_cb_) {
+ simcall_.timeout_cb_->remove();
+ simcall_.timeout_cb_ = nullptr;
}
- simix_global->mutex.unlock();
+ cleanup_from_simix();
- context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
- simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_termination(*ciface()); });
- context_->iwannadie = true;
+ context_->set_wannadie(false); // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops
+ actor::simcall([this] { s4u::Actor::on_termination(*get_ciface()); });
+ context_->set_wannadie();
}
void ActorImpl::exit()
{
- context_->iwannadie = true;
+ context_->set_wannadie();
suspended_ = false;
exception_ = nullptr;
/* destroy the blocking synchro if any */
- if (waiting_synchro != nullptr) {
- waiting_synchro->cancel();
- waiting_synchro->state_ = SIMIX_FAILED;
+ if (waiting_synchro_ != nullptr) {
+ waiting_synchro_->cancel();
+ waiting_synchro_->state_ = activity::State::FAILED;
- activity::ExecImplPtr exec = boost::dynamic_pointer_cast<activity::ExecImpl>(waiting_synchro);
- activity::CommImplPtr comm = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro);
+ activity::ExecImplPtr exec = boost::dynamic_pointer_cast<activity::ExecImpl>(waiting_synchro_);
+ activity::CommImplPtr comm = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro_);
if (exec != nullptr) {
exec->clean_action();
} else if (comm != nullptr) {
- comms.remove(waiting_synchro);
// Remove first occurrence of &actor->simcall:
- auto i = boost::range::find(waiting_synchro->simcalls_, &simcall);
- if (i != waiting_synchro->simcalls_.end())
- waiting_synchro->simcalls_.remove(&simcall);
+ auto i = boost::range::find(waiting_synchro_->simcalls_, &simcall_);
+ if (i != waiting_synchro_->simcalls_.end())
+ waiting_synchro_->simcalls_.remove(&simcall_);
} else {
- activity::ActivityImplPtr(waiting_synchro)->finish();
+ activity::ActivityImplPtr(waiting_synchro_)->finish();
}
- waiting_synchro = nullptr;
+ activities_.remove(waiting_synchro_);
+ waiting_synchro_ = nullptr;
}
// Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that
this->throw_exception(std::make_exception_ptr(ForcefulKillException(host_->is_on() ? "exited" : "host failed")));
}
-void ActorImpl::kill(ActorImpl* actor)
+void ActorImpl::kill(ActorImpl* actor) const
{
+ xbt_assert(actor != simix_global->maestro_, "Killing maestro is a rather bad idea");
if (actor->finished_) {
XBT_DEBUG("Ignoring request to kill actor %s@%s that is already dead", actor->get_cname(),
actor->host_->get_cname());
actor->exit();
- if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) ==
- end(simix_global->actors_to_run) &&
- actor != this) {
+ if (actor == this) {
+ XBT_DEBUG("Go on, this is a suicide,");
+ } else if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) !=
+ end(simix_global->actors_to_run)) {
+ XBT_DEBUG("Actor %s is already in the to_run list", actor->get_cname());
+ } else {
XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname());
simix_global->actors_to_run.push_back(actor);
}
}
-void ActorImpl::kill_all()
+void ActorImpl::kill_all() const
{
for (auto const& kv : simix_global->process_list)
if (kv.second != this)
if (kill_time <= SIMIX_get_clock())
return;
XBT_DEBUG("Set kill time %f for actor %s@%s", kill_time, get_cname(), host_->get_cname());
- kill_timer = simix::Timer::set(kill_time, [this] {
+ kill_timer_ = simix::Timer::set(kill_time, [this] {
this->exit();
- kill_timer = nullptr;
+ kill_timer_ = nullptr;
});
}
-double ActorImpl::get_kill_time()
+double ActorImpl::get_kill_time() const
{
- return kill_timer ? kill_timer->get_date() : 0;
+ return kill_timer_ ? kill_timer_->get_date() : 0;
}
void ActorImpl::yield()
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", get_cname());
- if (context_->iwannadie) {
+ if (context_->wannadie()) {
XBT_DEBUG("Actor %s@%s is dead", get_cname(), host_->get_cname());
- // throw simgrid::kernel::context::ForcefulKillException(); Does not seem to properly kill the actor
context_->stop();
THROW_IMPOSSIBLE;
}
XBT_DEBUG("Hey! I'm suspended.");
xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls.");
- suspended_ = false;
- suspend(this);
+
+ if (waiting_synchro_ != nullptr) // Not sure of when this will happen. Maybe when suspending early in the SR when a
+ waiting_synchro_->suspend(); // waiting_synchro was terminated
+
+ yield(); // Yield back to maestro without proceeding with my execution. I'll get rescheduled by resume()
}
if (exception_ != nullptr) {
}
if (SMPI_switch_data_segment && not finished_) {
- SMPI_switch_data_segment(iface());
+ SMPI_switch_data_segment(get_iface());
}
}
s4u::Actor* ActorImpl::restart()
{
- xbt_assert(this != simix_global->maestro_process, "Restarting maestro is not supported");
+ xbt_assert(this != simix_global->maestro_, "Restarting maestro is not supported");
XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname());
actor->set_kill_time(arg.kill_time);
actor->set_auto_restart(arg.auto_restart);
- return actor->ciface();
+ return actor->get_ciface();
}
-activity::ActivityImplPtr ActorImpl::suspend(ActorImpl* issuer)
+void ActorImpl::suspend()
{
if (suspended_) {
XBT_DEBUG("Actor '%s' is already suspended", get_cname());
- return nullptr;
+ return;
}
suspended_ = true;
- /* 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 {
- activity::ExecImpl* exec = new activity::ExecImpl();
- (*exec).set_name("suspend").set_host(host_).set_flops_amount(0.0).start();
- return activity::ExecImplPtr(exec);
- }
+ /* If the suspended actor is waiting on a sync, suspend its synchronization.
+ * Otherwise, it will suspend itself when scheduled, ie, very soon. */
+ if (waiting_synchro_ != nullptr)
+ waiting_synchro_->suspend();
}
void ActorImpl::resume()
{
XBT_IN("actor = %p", this);
- if (context_->iwannadie) {
+ if (context_->wannadie()) {
XBT_VERB("Ignoring request to suspend an actor that is currently dying.");
return;
}
return;
suspended_ = false;
- /* resume the synchronization that was blocking the resumed actor. */
- if (waiting_synchro)
- waiting_synchro->resume();
+ /* resume the activity that was blocking the resumed actor. */
+ if (waiting_synchro_)
+ waiting_synchro_->resume();
+ else // Reschedule the actor if it was forcefully unscheduled in yield()
+ simix_global->actors_to_run.push_back(this);
XBT_OUT();
}
-activity::ActivityImplPtr ActorImpl::join(ActorImpl* actor, double timeout)
+activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout)
{
activity::ActivityImplPtr sleep = this->sleep(timeout);
- SIMIX_process_on_exit(actor, [sleep](bool) {
+ actor->on_exit->emplace_back([sleep](bool) {
if (sleep->surf_action_)
sleep->surf_action_->finish(resource::Action::State::FINISHED);
});
activity::ActivityImplPtr ActorImpl::sleep(double duration)
{
if (not host_->is_on())
- throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
+ throw_exception(std::make_exception_ptr(HostFailureException(
XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there.")));
- activity::SleepImpl* sleep = new activity::SleepImpl();
- (*sleep).set_name("sleep").set_host(host_).set_duration(duration).start();
+ auto sleep = new activity::SleepImpl();
+ sleep->set_name("sleep").set_host(host_).set_duration(duration).start();
return activity::SleepImplPtr(sleep);
}
resume();
/* cancel the blocking synchro if any */
- if (waiting_synchro) {
- waiting_synchro->cancel();
-
- activity::CommImplPtr comm = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro);
-
- if (comm != nullptr)
- comms.remove(comm);
+ if (waiting_synchro_) {
+ waiting_synchro_->cancel();
+ activities_.remove(waiting_synchro_);
+ waiting_synchro_ = nullptr;
+ }
+}
- waiting_synchro = nullptr;
+void ActorImpl::simcall_answer()
+{
+ if (this != simix_global->maestro_) {
+ XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall_.call_), (int)simcall_.call_,
+ get_cname(), this);
+ xbt_assert(simcall_.call_ != SIMCALL_NONE);
+ simcall_.call_ = SIMCALL_NONE;
+ xbt_assert(not XBT_LOG_ISENABLED(simix_process, xbt_log_priority_debug) ||
+ std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) ==
+ end(simix_global->actors_to_run),
+ "Actor %p should not exist in actors_to_run!", this);
+ simix_global->actors_to_run.push_back(this);
}
}
void ActorImpl::set_host(s4u::Host* dest)
{
- xbt::intrusive_erase(host_->pimpl_->process_list_, *this);
+ host_->pimpl_->remove_actor(this);
host_ = dest;
- dest->pimpl_->process_list_.push_back(*this);
+ dest->pimpl_->add_actor(this);
}
-ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host)
+ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) const
{
- ActorImpl* actor = new ActorImpl(xbt::string(name), host);
+ auto* actor = new ActorImpl(xbt::string(name), host);
actor->set_ppid(this->pid_);
intrusive_ptr_add_ref(actor);
/* The on_creation() signal must be delayed until there, where the pid and everything is set */
- s4u::Actor::on_creation(*actor->ciface());
+ s4u::Actor::on_creation(*actor->get_ciface());
return ActorImplPtr(actor);
}
-ActorImpl* ActorImpl::start(const simix::ActorCode& code)
+ActorImpl* ActorImpl::start(const ActorCode& code)
{
xbt_assert(code && host_ != nullptr, "Invalid parameters");
if (not host_->is_on()) {
XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name_.c_str(), host_->get_cname());
intrusive_ptr_release(this);
- throw simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.");
+ throw HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.");
}
this->code_ = code;
XBT_VERB("Create context %s", get_cname());
- context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this));
+ context_.reset(simix_global->context_factory->create_context(ActorCode(code), this));
XBT_DEBUG("Start context '%s'", get_cname());
/* Add the actor to its host's actor list */
- host_->pimpl_->process_list_.push_back(*this);
+ host_->pimpl_->add_actor(this);
simix_global->process_list[pid_] = this;
/* Now insert it in the global actor list and in the actor to run list */
return this;
}
-ActorImplPtr ActorImpl::create(const std::string& name, const simix::ActorCode& code, void* data, s4u::Host* host,
- const std::unordered_map<std::string, std::string>* properties, ActorImpl* parent_actor)
+ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host,
+ const std::unordered_map<std::string, std::string>* properties,
+ const ActorImpl* parent_actor)
{
XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname());
if (parent_actor != nullptr)
actor = parent_actor->init(xbt::string(name), host);
else
- actor = SIMIX_process_self()->init(xbt::string(name), host);
+ actor = self()->init(xbt::string(name), host);
/* actor data */
actor->set_user_data(data);
void create_maestro(const std::function<void()>& code)
{
/* Create maestro actor and initialize it */
- ActorImpl* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr);
+ auto* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr);
if (not code) {
- maestro->context_.reset(simix_global->context_factory->create_context(simix::ActorCode(), maestro));
+ maestro->context_.reset(simix_global->context_factory->create_context(ActorCode(), maestro));
} else {
- maestro->context_.reset(simix_global->context_factory->create_maestro(simix::ActorCode(code), maestro));
+ maestro->context_.reset(simix_global->context_factory->create_maestro(ActorCode(code), maestro));
}
- maestro->simcall.issuer = maestro;
- simix_global->maestro_process = maestro;
+ maestro->simcall_.issuer_ = maestro;
+ simix_global->maestro_ = maestro;
}
} // namespace actor
} // namespace kernel
} // namespace simgrid
-void SIMIX_process_detach() // deprecated v3.25
-{
- simgrid::kernel::actor::ActorImpl::detach();
-}
-
-smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
- std::unordered_map<std::string, std::string>* properties,
- smx_actor_t /*parent_process*/) // deprecated 3.25
-{
- return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
-}
-
-void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor)
-{
- smx_activity_t sync_suspend = actor->suspend(simcall->issuer);
-
- if (actor != simcall->issuer) {
- SIMIX_simcall_answer(simcall);
- } else {
- sync_suspend->simcalls_.push_back(simcall);
- actor->waiting_synchro = sync_suspend;
- actor->waiting_synchro->suspend();
- }
- /* If we are suspending ourselves, then just do not finish the simcall now */
-}
-
-int SIMIX_process_count()
+int SIMIX_process_count() // XBT_ATTRIB_DEPRECATED_v329
{
return simix_global->process_list.size();
}
-void* SIMIX_process_self_get_data() // deprecated
+void* SIMIX_process_self_get_data() // XBT_ATTRIB_DEPRECATED_v329
{
- smx_actor_t self = SIMIX_process_self();
+ smx_actor_t self = simgrid::kernel::actor::ActorImpl::self();
if (self == nullptr) {
return nullptr;
return self->get_user_data();
}
-void SIMIX_process_self_set_data(void* data) // deprecated
+void SIMIX_process_self_set_data(void* data) // XBT_ATTRIB_DEPRECATED_v329
{
- SIMIX_process_self()->set_user_data(data);
+ simgrid::kernel::actor::ActorImpl::self()->set_user_data(data);
}
/* needs to be public and without simcall because it is called
by exceptions and logging events */
const char* SIMIX_process_self_get_name()
{
-
- smx_actor_t process = SIMIX_process_self();
- if (process == nullptr || process == simix_global->maestro_process)
- return "maestro";
-
- return process->get_cname();
-}
-
-void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout)
-{
- 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 = simcall->issuer->join(process, timeout);
- sync->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = sync;
-}
-
-void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration)
-{
- if (MC_is_active() || MC_record_replay_is_active()) {
- MC_process_clock_add(simcall->issuer, duration);
- simcall_process_sleep__set__result(simcall, SIMIX_DONE);
- SIMIX_simcall_answer(simcall);
- return;
- }
- smx_activity_t sync = simcall->issuer->sleep(duration);
- sync->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = sync;
+ return SIMIX_is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname();
}
/**
* @param self the current process
*/
-/** @brief Returns the list of processes to run.
- * @deprecated
- */
-const std::vector<smx_actor_t>& simgrid::simix::process_get_runnable()
-{
- return simix_global->actors_to_run;
-}
-
/** @brief Returns the process from PID. */
smx_actor_t SIMIX_process_from_PID(aid_t PID)
{
return item->second;
}
-void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data)
-{
- SIMIX_process_on_exit(actor, [fun, data](bool failed) {
- intptr_t status = failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
- fun(reinterpret_cast<void*>(status), data);
- });
-}
-
-void SIMIX_process_on_exit(smx_actor_t actor, const std::function<void(int, void*)>& fun, void* data)
-{
- SIMIX_process_on_exit(actor, [fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); });
-}
-
-void SIMIX_process_on_exit(smx_actor_t actor, const std::function<void(bool /*failed*/)>& fun)
+void SIMIX_process_on_exit(smx_actor_t actor,
+ const std::function<void(bool /*failed*/)>& fun) // XBT_ATTRIB_DEPRECATED_v329
{
xbt_assert(actor, "current process not found: are you in maestro context ?");
actor->on_exit->emplace_back(fun);
* @param host where the new agent is executed.
* @param properties the properties of the process
*/
-smx_actor_t simcall_process_create(const std::string& name, const simgrid::simix::ActorCode& code, void* data,
+smx_actor_t simcall_process_create(const std::string& name, const simgrid::kernel::actor::ActorCode& code, void* data,
sg_host_t host, std::unordered_map<std::string, std::string>* properties)
{
- smx_actor_t self = SIMIX_process_self();
- return simgrid::simix::simcall([&name, &code, data, host, properties, self] {
+ smx_actor_t self = simgrid::kernel::actor::ActorImpl::self();
+ return simgrid::kernel::actor::simcall([&name, &code, data, host, properties, self] {
return simgrid::kernel::actor::ActorImpl::create(name, code, data, host, properties, self).get();
});
}
-void simcall_process_set_data(smx_actor_t process, void* data)
+void simcall_process_set_data(smx_actor_t process, void* data) // XBT_ATTRIB_DEPRECATED_v329
{
- simgrid::simix::simcall([process, data] { process->set_user_data(data); });
+ simgrid::kernel::actor::simcall([process, data] { process->set_user_data(data); });
}
