#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"
ActorImpl* ActorImpl::self()
{
- context::Context* self_context = context::Context::self();
+ 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;
+ pid_ = maxpid++;
+ simcall_.issuer_ = this;
+ stacksize_ = smx_context_stack_size;
}
ActorImpl::~ActorImpl()
{
if (simix_global != nullptr && this != simix_global->maestro_)
- s4u::Actor::on_destruction(*ciface());
+ s4u::Actor::on_destruction(*get_ciface());
}
/* Become an actor in the simulation
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;
context->attach_start();
/* 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);
}
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_) /* 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;
}
+ if (simcall_.timeout_cb_) {
+ simcall_.timeout_cb_->remove();
+ simcall_.timeout_cb_ = nullptr;
+ }
+
cleanup_from_simix();
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(*ciface()); });
+ actor::simcall([this] { s4u::Actor::on_termination(*get_ciface()); });
context_->set_wannadie();
}
exception_ = nullptr;
/* destroy the blocking synchro if any */
- if (waiting_synchro != nullptr) {
- waiting_synchro->cancel();
- waiting_synchro->state_ = activity::State::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_) {
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()
XBT_DEBUG("Hey! I'm suspended.");
xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls.");
- suspended_ = false;
- suspend();
+
+ 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());
}
}
actor->set_kill_time(arg.kill_time);
actor->set_auto_restart(arg.auto_restart);
- return actor->ciface();
+ return actor->get_ciface();
}
void ActorImpl::suspend()
suspended_ = true;
- /* If the suspended actor is waiting on a sync, suspend its synchronization. */
- if (waiting_synchro == nullptr) {
- auto exec = new activity::ExecImpl();
- exec->set_name("suspend").set_host(host_).set_flops_amount(0.0).start();
- waiting_synchro = activity::ExecImplPtr(exec);
-
- waiting_synchro->simcalls_.push_back(&simcall);
- }
- waiting_synchro->suspend();
+ /* 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()
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();
}
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);
-
- waiting_synchro = nullptr;
+ if (waiting_synchro_) {
+ waiting_synchro_->cancel();
+ activities_.remove(waiting_synchro_);
+ 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_,
+ XBT_DEBUG("Answer simcall %s (%d) issued by %s (%p)", SIMIX_simcall_name(simcall_.call_), (int)simcall_.call_,
get_cname(), this);
- simcall.call_ = SIMCALL_NONE;
+ 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),
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);
}
}
ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host,
- const std::unordered_map<std::string, std::string>* properties, ActorImpl* parent_actor)
+ 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());
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(ActorCode(), maestro));
maestro->context_.reset(simix_global->context_factory->create_maestro(ActorCode(code), maestro));
}
- maestro->simcall.issuer_ = maestro;
+ maestro->simcall_.issuer_ = maestro;
simix_global->maestro_ = maestro;
}
return simix_global->process_list.size();
}
-// XBT_DEPRECATED_v329
-void* SIMIX_process_self_get_data()
+void* SIMIX_process_self_get_data() // XBT_ATTRIB_DEPRECATED_v329
{
smx_actor_t self = simgrid::kernel::actor::ActorImpl::self();
return self->get_user_data();
}
-// XBT_DEPRECATED_v329
-void SIMIX_process_self_set_data(void* data)
+void SIMIX_process_self_set_data(void* data) // XBT_ATTRIB_DEPRECATED_v329
{
simgrid::kernel::actor::ActorImpl::self()->set_user_data(data);
}
});
}
-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::kernel::actor::simcall([process, data] { process->set_user_data(data); });
}
