/* 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 "simgrid/s4u/Actor.hpp"
#include "mc/mc.h"
#include "simgrid/Exception.hpp"
-#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Exec.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/AppSide.hpp"
#include "src/simix/smx_private.hpp"
+#if HAVE_SMPI
+#include "src/smpi/include/private.hpp"
+#endif
#include "src/surf/HostImpl.hpp"
#include "src/surf/cpu_interface.hpp"
ActorImpl::~ActorImpl()
{
- if (simix_global != nullptr && this != simix_global->maestro_)
+ if (simix_global != nullptr && not simix_global->is_maestro(this))
s4u::Actor::on_destruction(*get_ciface());
}
auto* actor = new ActorImpl(xbt::string(name), host);
/* Actor data */
- actor->set_user_data(data);
+ actor->piface_.set_data(data);
actor->code_ = nullptr;
XBT_VERB("Create context %s", actor->get_cname());
xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first");
- actor->context_.reset(simix_global->context_factory->attach(actor));
+ actor->context_.reset(simix_global->get_context_factory()->attach(actor));
/* Add the actor to it's host actor list */
host->get_impl()->add_actor(actor);
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 */
+ if (simix_global->is_maestro(this)) /* Do not cleanup maestro */
return;
XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro_.get());
void ActorImpl::kill(ActorImpl* actor) const
{
- xbt_assert(actor != simix_global->maestro_, "Killing maestro is a rather bad idea");
+ xbt_assert(not simix_global->is_maestro(actor), "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());
void ActorImpl::set_kill_time(double kill_time)
{
- if (kill_time <= SIMIX_get_clock())
+ if (kill_time <= s4u::Engine::get_clock())
return;
XBT_DEBUG("Set kill time %f for actor %s@%s", kill_time, get_cname(), host_->get_cname());
kill_timer_ = timer::Timer::set(kill_time, [this] {
}
}
- if (SMPI_switch_data_segment && not finished_) {
- SMPI_switch_data_segment(get_iface());
- }
+#if HAVE_SMPI
+ if (not finished_)
+ smpi_switch_data_segment(get_iface());
+#endif
}
/** This actor will be terminated automatically when the last non-daemon actor finishes */
s4u::Actor* ActorImpl::restart()
{
- xbt_assert(this != simix_global->maestro_, "Restarting maestro is not supported");
+ xbt_assert(not simix_global->is_maestro(this), "Restarting maestro is not supported");
XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname());
void ActorImpl::simcall_answer()
{
- if (this != simix_global->maestro_) {
+ if (not simix_global->is_maestro(this)) {
XBT_DEBUG("Answer simcall %s issued by %s (%p)", SIMIX_simcall_name(simcall_), get_cname(), this);
xbt_assert(simcall_.call_ != simix::Simcall::NONE);
simcall_.call_ = simix::Simcall::NONE;
this->code_ = code;
XBT_VERB("Create context %s", get_cname());
- context_.reset(simix_global->context_factory->create_context(ActorCode(code), this));
+ context_.reset(simix_global->get_context_factory()->create_context(ActorCode(code), this));
XBT_DEBUG("Start context '%s'", get_cname());
actor = self()->init(xbt::string(name), host);
/* actor data */
- actor->set_user_data(data);
+ actor->piface_.set_data(data);
actor->start(code);
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->get_context_factory()->create_context(ActorCode(), maestro));
} else {
- maestro->context_.reset(simix_global->context_factory->create_maestro(ActorCode(code), maestro));
+ maestro->context_.reset(simix_global->get_context_factory()->create_maestro(ActorCode(code), maestro));
}
maestro->simcall_.issuer_ = maestro;
- simix_global->maestro_ = maestro;
+ simix_global->set_maestro(maestro);
}
} // namespace actor
void* SIMIX_process_self_get_data() // XBT_ATTRIB_DEPRECATED_v329
{
- smx_actor_t self = simgrid::kernel::actor::ActorImpl::self();
-
- if (self == nullptr) {
- return nullptr;
- }
- return self->get_user_data();
+ simgrid::s4u::Actor* self = simgrid::s4u::Actor::self();
+ return self ? self->get_data() : nullptr;
}
void SIMIX_process_self_set_data(void* data) // XBT_ATTRIB_DEPRECATED_v329
{
- simgrid::kernel::actor::ActorImpl::self()->set_user_data(data);
+ simgrid::s4u::Actor::self()->set_data(data);
}
/* needs to be public and without simcall because it is called
}
/** @brief Returns the process from PID. */
-smx_actor_t SIMIX_process_from_PID(aid_t pid)
+smx_actor_t SIMIX_process_from_PID(aid_t pid) // XBT_ATTRIB_DEPRECATD_v331
{
return simgrid::kernel::actor::ActorImpl::by_pid(pid);
}
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); });
+ simgrid::kernel::actor::simcall([process, data] { process->get_ciface()->set_data(data); });
}
