#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.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"
return process->comms.size() > 0;
}
-/**
- * @brief Moves a process to the list of processes to destroy.
+namespace simgrid {
+namespace kernel {
+namespace actor {
+
+ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(name), piface_(this)
+{
+ pid_ = simix_process_maxpid++;
+ simcall.issuer = this;
+}
+
+ActorImpl::~ActorImpl()
+{
+ delete this->context_;
+}
+/* Become an actor in the simulation
+ *
+ * Currently this can only be called by the main thread (once) and only work with some thread factories
+ * (currently ThreadContextFactory).
+ *
+ * In the future, it might be extended in order to attach other threads created by a third party library.
*/
-void SIMIX_process_cleanup(smx_actor_t process)
+
+ActorImplPtr ActorImpl::attach(std::string name, void* data, s4u::Host* host,
+ std::unordered_map<std::string, std::string>* properties)
{
- XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
- process->waiting_synchro.get());
+ // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions.
- simix_global->mutex.lock();
+ XBT_DEBUG("Attach process %s on host '%s'", name.c_str(), host->get_cname());
- 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);
+ if (not host->is_on()) {
+ XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
+ std::rethrow_exception(
+ std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.")));
}
- process->context_->iwannadie = false;
- simix_global->mutex.unlock();
-}
+ ActorImpl* actor = new ActorImpl(xbt::string(name), host);
+ /* Actor data */
+ actor->set_user_data(data);
+ actor->code = nullptr;
-/**
- * Garbage collection
+ XBT_VERB("Create context %s", actor->get_cname());
+ xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first");
+ actor->context_ = simix_global->context_factory->attach(actor);
+
+ /* Add properties */
+ if (properties != nullptr)
+ for (auto const& kv : *properties)
+ actor->set_property(kv.first, kv.second);
+
+ /* Add the process to it's host process list */
+ host->pimpl_->process_list_.push_back(*actor);
+
+ /* Now insert it in the global process list and in the process 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_);
+ 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::ActorPtr tmp = actor->iface(); // Passing this directly to on_creation will lead to crashes
+ simgrid::s4u::Actor::on_creation(tmp);
+
+ return ActorImplPtr(actor);
+}
+/** @brief Detach an actor attached with `attach()`
*
- * Should be called some time to time to free the memory allocated for processes that have finished (or killed).
+ * This is called when the current actor has finished its job.
+ * Used in the main thread, it waits for the simulation to finish before returning. When it returns, the other
+ * simulated actors and the maestro are destroyed.
*/
-void SIMIX_process_empty_trash()
+void ActorImpl::detach()
{
- while (not simix_global->process_to_destroy.empty()) {
- smx_actor_t process = &simix_global->process_to_destroy.front();
- simix_global->process_to_destroy.pop_front();
- XBT_DEBUG("Getting rid of %p",process);
- intrusive_ptr_release(process);
- }
-#if SIMGRID_HAVE_MC
- xbt_dynar_reset(simix_global->dead_actors_vector);
-#endif
-}
-
-namespace simgrid {
-namespace kernel {
-namespace actor {
+ auto* context = dynamic_cast<context::AttachContext*>(context::Context::self());
+ if (context == nullptr)
+ xbt_die("Not a suitable context");
-ActorImpl::ActorImpl(simgrid::xbt::string name, simgrid::s4u::Host* host) : name_(name), host_(host), piface_(this)
-{
- pid_ = simix_process_maxpid++;
- simcall.issuer = this;
+ context->get_actor()->cleanup();
+ context->attach_stop();
}
-ActorImpl::~ActorImpl()
+void ActorImpl::cleanup()
{
- delete this->context_;
+ if (this == simix_global->maestro_process) /* Do not cleanup maestro */
+ return;
+
+ XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get());
+
+ 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, smx_actor_t, this);
+#endif
+ simix_global->actors_to_destroy.push_back(*this);
+ }
+ context_->iwannadie = false;
+
+ simix_global->mutex.unlock();
}
void ActorImpl::exit()
context_->iwannadie = true;
blocked_ = false;
suspended_ = false;
- exception = nullptr;
+ exception_ = nullptr;
// Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that
if (not host_->is_on())
- this->throw_exception(std::make_exception_ptr(simgrid::kernel::context::StopRequest("host failed")));
+ this->throw_exception(std::make_exception_ptr(ForcefulKillException("host failed")));
/* destroy the blocking synchro if any */
if (waiting_synchro != nullptr) {
} else if (comm != nullptr) {
comms.remove(waiting_synchro);
comm->cancel();
- // Remove first occurrence of &process->simcall:
+ // 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);
sleep->surf_action_->cancel();
sleep->post();
} else if (raw != nullptr) {
- SIMIX_synchro_stop_waiting(this, &simcall);
+ raw->finish();
} else if (io != nullptr) {
io->cancel();
} else {
simgrid::kernel::activity::ActivityImplPtr activity = waiting_synchro;
- xbt_die("Activity %s is of unknown type %s", activity->name_.c_str(),
+ xbt_die("Activity %s is of unknown type %s", activity->get_cname(),
simgrid::xbt::demangle(typeid(activity).name()).get());
}
}
}
-void ActorImpl::kill(smx_actor_t actor)
+void ActorImpl::kill(ActorImpl* actor)
{
if (actor->finished_) {
- XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", actor->get_cname(),
+ XBT_DEBUG("Ignoring request to kill actor %s@%s that is already dead", actor->get_cname(),
actor->host_->get_cname());
return;
}
- XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", get_cname(), host_->get_cname(), actor->get_cname(),
- actor->host_->get_cname());
+ XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", get_cname(), host_ ? host_->get_cname() : "", actor->get_cname(),
+ actor->host_ ? actor->host_->get_cname() : "");
actor->exit();
- if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) ==
- end(simix_global->process_to_run) &&
+ if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) ==
+ end(simix_global->actors_to_run) &&
actor != this) {
XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname());
- simix_global->process_to_run.push_back(actor);
+ simix_global->actors_to_run.push_back(actor);
}
}
{
if (kill_time <= SIMIX_get_clock())
return;
- XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, get_cname(), host_->get_cname());
- kill_timer = SIMIX_timer_set(kill_time, [this] {
+ 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] {
this->exit();
kill_timer = nullptr;
});
}
+double ActorImpl::get_kill_time()
+{
+ return kill_timer ? kill_timer->get_date() : 0;
+}
+
static void dying_daemon(int /*exit_status*/, void* data)
{
std::vector<ActorImpl*>* vect = &simix_global->daemons;
vect->pop_back();
}
-/** This process will be terminated automatically when the last non-daemon process finishes */
+void ActorImpl::yield()
+{
+ XBT_DEBUG("Yield actor '%s'", get_cname());
+
+ /* Go into sleep and return control to maestro */
+ context_->suspend();
+
+ /* Ok, maestro returned control to us */
+ XBT_DEBUG("Control returned to me: '%s'", get_cname());
+
+ if (context_->iwannadie) {
+
+ 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;
+ }
+
+ if (suspended_) {
+ XBT_DEBUG("Hey! I'm suspended.");
+
+ xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls.");
+ suspended_ = false;
+ suspend(this);
+ }
+
+ if (exception_ != nullptr) {
+ XBT_DEBUG("Wait, maestro left me an exception");
+ std::exception_ptr exception = std::move(exception_);
+ exception_ = nullptr;
+ std::rethrow_exception(std::move(exception));
+ }
+
+ if (SMPI_switch_data_segment && not finished_) {
+ SMPI_switch_data_segment(iface());
+ }
+}
+
+/** This actor will be terminated automatically when the last non-daemon actor finishes */
void ActorImpl::daemonize()
{
if (not daemon_) {
}
}
-simgrid::s4u::Actor* ActorImpl::restart()
+s4u::Actor* ActorImpl::restart()
{
- XBT_DEBUG("Restarting process %s on %s", get_cname(), host_->get_cname());
+ XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname());
- // retrieve the arguments of the old process
- simgrid::kernel::actor::ProcessArg arg = ProcessArg(host_, this);
+ // retrieve the arguments of the old actor
+ ProcessArg arg = ProcessArg(host_, this);
- // kill the old process
+ // kill the old actor
(this == simix_global->maestro_process) ? this->exit() : SIMIX_process_self()->kill(this);
- // start the new process
+ // start the new actor
ActorImplPtr actor =
ActorImpl::create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr);
actor->set_kill_time(arg.kill_time);
return actor->ciface();
}
-smx_activity_t ActorImpl::suspend(ActorImpl* issuer)
+activity::ActivityImplPtr ActorImpl::suspend(ActorImpl* issuer)
{
if (suspended_) {
XBT_DEBUG("Actor '%s' is already suspended", get_cname());
return nullptr;
} else {
- return activity::ExecImplPtr(new activity::ExecImpl("suspend", "", nullptr, this->host_))->start(0.0, 1.0, 0.0);
+ return activity::ExecImplPtr(new activity::ExecImpl("suspend", "", this->host_))->start(0.0, 1.0, 0.0);
}
}
XBT_OUT();
}
-smx_activity_t ActorImpl::join(smx_actor_t actor, double timeout)
+activity::ActivityImplPtr ActorImpl::join(smx_actor_t actor, double timeout)
{
- smx_activity_t res = this->sleep(timeout);
+ activity::ActivityImplPtr res = this->sleep(timeout);
intrusive_ptr_add_ref(res.get());
SIMIX_process_on_exit(actor,
[](int, void* arg) {
res.get());
return res;
}
-smx_activity_t ActorImpl::sleep(double duration)
+
+activity::ActivityImplPtr ActorImpl::sleep(double duration)
{
if (not host_->is_on())
throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
- XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there.")));
+ XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there.")));
return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_))
->start(duration);
void ActorImpl::throw_exception(std::exception_ptr e)
{
- exception = e;
+ exception_ = e;
if (suspended_)
resume();
/* cancel the blocking synchro if any */
if (waiting_synchro) {
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(waiting_synchro);
+ activity::ExecImplPtr exec = boost::dynamic_pointer_cast<activity::ExecImpl>(waiting_synchro);
if (exec != nullptr)
exec->cancel();
- simgrid::kernel::activity::CommImplPtr comm =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(waiting_synchro);
+ activity::CommImplPtr comm = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro);
if (comm != nullptr) {
comms.remove(comm);
comm->cancel();
}
- simgrid::kernel::activity::SleepImplPtr sleep =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(waiting_synchro);
+ activity::SleepImplPtr sleep = boost::dynamic_pointer_cast<activity::SleepImpl>(waiting_synchro);
if (sleep != nullptr) {
SIMIX_process_sleep_destroy(waiting_synchro);
- if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), this) ==
- end(simix_global->process_to_run) &&
+ if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) ==
+ end(simix_global->actors_to_run) &&
this != SIMIX_process_self()) {
XBT_DEBUG("Inserting [%p] %s in the to_run list", this, get_cname());
- simix_global->process_to_run.push_back(this);
+ simix_global->actors_to_run.push_back(this);
}
}
- simgrid::kernel::activity::RawImplPtr raw =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(waiting_synchro);
+ activity::RawImplPtr raw = boost::dynamic_pointer_cast<activity::RawImpl>(waiting_synchro);
if (raw != nullptr) {
- SIMIX_synchro_stop_waiting(this, &simcall);
+ raw->finish();
}
- simgrid::kernel::activity::IoImplPtr io =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(waiting_synchro);
+ activity::IoImplPtr io = boost::dynamic_pointer_cast<activity::IoImpl>(waiting_synchro);
if (io != nullptr) {
io->cancel();
}
waiting_synchro = nullptr;
}
-void ActorImpl::set_host(sg_host_t dest)
+void ActorImpl::set_host(s4u::Host* dest)
{
simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this);
host_ = dest;
dest->pimpl_->process_list_.push_back(*this);
}
-ActorImplPtr ActorImpl::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_actor)
+ActorImplPtr ActorImpl::create(std::string name, simix::ActorCode code, void* data, s4u::Host* host,
+ std::unordered_map<std::string, std::string>* properties, ActorImpl* parent_actor)
{
XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname());
if (not host->is_on()) {
XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name.c_str(), host->get_cname());
- return nullptr;
+ std::rethrow_exception(
+ std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot create actor on failed host.")));
}
- ActorImpl* actor = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host);
+ ActorImpl* actor = new ActorImpl(simgrid::xbt::string(name), host);
xbt_assert(code && host != nullptr, "Invalid parameters");
/* actor data */
actor->code = code;
if (parent_actor != nullptr)
- actor->ppid_ = parent_actor->pid_;
+ actor->set_ppid(parent_actor->get_pid());
XBT_VERB("Create context %s", actor->get_cname());
- actor->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, actor);
+ actor->context_ = simix_global->context_factory->create_context(std::move(code), actor);
/* Add properties */
if (properties != nullptr)
for (auto const& kv : *properties)
actor->set_property(kv.first, kv.second);
- /* Add the process to its host's process list */
+ /* Add the actor to its host's actor list */
host->pimpl_->process_list_.push_back(*actor);
XBT_DEBUG("Start context '%s'", actor->get_cname());
- /* Now insert it in the global process list and in the process to run list */
- simix_global->process_list[actor->pid_] = actor;
+ /* Now insert it in the global actor list and in the actor 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->process_to_run.push_back(actor);
+ simix_global->actors_to_run.push_back(actor);
intrusive_ptr_add_ref(actor);
/* The on_creation() signal must be delayed until there, where the pid and everything is set */
- simgrid::s4u::Actor::on_creation(actor->iface());
+ s4u::Actor::on_creation(actor->iface());
return ActorImplPtr(actor);
}
-void create_maestro(simgrid::simix::ActorCode code)
+void create_maestro(simix::ActorCode code)
{
- /* Create maestro process and initialize it */
- smx_actor_t maestro = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(""), /*host*/ nullptr);
+ /* Create maestro actor and initialize it */
+ ActorImpl* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr);
if (not code) {
- maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), nullptr, maestro);
+ maestro->context_ = simix_global->context_factory->create_context(simix::ActorCode(), maestro);
} else {
maestro->context_ = simix_global->context_factory->create_maestro(code, maestro);
}
} // namespace kernel
}
-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)
-{
- // 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 (not host->is_on()) {
- XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname);
- return nullptr;
- }
-
- smx_actor_t actor = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host);
- /* Actor data */
- actor->set_user_data(data);
- actor->code = nullptr;
-
- if (parent_process != nullptr)
- actor->ppid_ = parent_process->pid_;
-
- XBT_VERB("Create context %s", actor->get_cname());
- xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first");
- actor->context_ = simix_global->context_factory->attach(&SIMIX_process_cleanup, actor);
-
- /* Add properties */
- if (properties != nullptr)
- for (auto const& kv : *properties)
- actor->set_property(kv.first, kv.second);
-
- /* Add the process to it's host process list */
- host->pimpl_->process_list_.push_back(*actor);
-
- /* Now insert it in the global process list and in the process to run list */
- simix_global->process_list[actor->pid_] = actor;
- XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname());
- simix_global->process_to_run.push_back(actor);
- intrusive_ptr_add_ref(actor);
-
- auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(actor->context_);
- 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::ActorPtr tmp = actor->iface(); // Passing this directly to on_creation will lead to crashes
- simgrid::s4u::Actor::on_creation(tmp);
-
- return actor;
-}
-
void SIMIX_process_detach()
{
- auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(simgrid::kernel::context::Context::self());
- if (context == nullptr)
- xbt_die("Not a suitable context");
-
- SIMIX_process_cleanup(context->get_actor());
- context->attach_stop();
+ simgrid::kernel::actor::ActorImpl::detach();
}
-/**
- * @brief Executes the processes from simix_global->process_to_run.
- *
- * The processes of simix_global->process_to_run are run (in parallel if
- * possible). On exit, simix_global->process_to_run is empty, and
- * simix_global->process_that_ran contains the list of processes that just ran.
- * The two lists are swapped so, be careful when using them before and after a
- * call to this function.
- */
-void SIMIX_process_runall()
+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*/)
{
- SIMIX_context_runall();
-
- simix_global->process_to_run.swap(simix_global->process_that_ran);
- simix_global->process_to_run.clear();
+ return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
}
/** @deprecated When this function gets removed, also remove the xbt_ex class, that is only there to help users to
{
SMX_EXCEPTION(actor, cat, value, msg);
- if (actor->suspended_)
+ if (actor->is_suspended())
actor->resume();
/* cancel the blocking synchro if any */
boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(actor->waiting_synchro);
if (sleep != nullptr) {
SIMIX_process_sleep_destroy(actor->waiting_synchro);
- if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) ==
- end(simix_global->process_to_run) &&
+ if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) ==
+ end(simix_global->actors_to_run) &&
actor != SIMIX_process_self()) {
XBT_DEBUG("Inserting [%p] %s in the to_run list", actor, actor->get_cname());
- simix_global->process_to_run.push_back(actor);
+ simix_global->actors_to_run.push_back(actor);
}
}
simgrid::kernel::activity::RawImplPtr raw =
boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(actor->waiting_synchro);
if (raw != nullptr) {
- SIMIX_synchro_stop_waiting(actor, &actor->simcall);
+ raw->finish();
}
simgrid::kernel::activity::IoImplPtr io =
{
XBT_DEBUG("Destroy sleep synchro %p", synchro.get());
simgrid::kernel::activity::SleepImplPtr sleep =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
+ boost::static_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
if (sleep->surf_action_) {
sleep->surf_action_->unref();
*
* @param self the current process
*/
-void SIMIX_process_yield(smx_actor_t self)
-{
- XBT_DEBUG("Yield actor '%s'", self->get_cname());
-
- /* Go into sleep and return control to maestro */
- self->context_->suspend();
-
- /* Ok, maestro returned control to us */
- XBT_DEBUG("Control returned to me: '%s'", self->get_cname());
-
- if (self->context_->iwannadie) {
-
- XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host_->get_cname());
- // throw simgrid::kernel::context::StopRequest(); Does not seem to properly kill the actor
- self->context_->stop();
- THROW_IMPOSSIBLE;
- }
-
- 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_ = false;
- self->suspend(self);
- }
-
- if (self->exception != nullptr) {
- XBT_DEBUG("Wait, maestro left me an exception");
- std::exception_ptr exception = std::move(self->exception);
- self->exception = nullptr;
- std::rethrow_exception(std::move(exception));
- }
-
- if (SMPI_switch_data_segment && not self->finished_) {
- SMPI_switch_data_segment(self->iface());
- }
-}
/** @brief Returns the list of processes to run.
* @deprecated
*/
const std::vector<smx_actor_t>& simgrid::simix::process_get_runnable()
{
- return simix_global->process_to_run;
+ return simix_global->actors_to_run;
}
/** @brief Returns the process from PID. */
SIMIX_process_on_exit(actor, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
}
-void SIMIX_process_on_exit(smx_actor_t actor, std::function<void(int, void*)> fun, void* data)
+void SIMIX_process_on_exit(smx_actor_t actor, std::function<void(bool, void*)> fun, void* data)
{
xbt_assert(actor, "current process not found: are you in maestro context ?");
