return process->comms.size() > 0;
}
-/**
- * @brief Moves a process to the list of processes to destroy.
- */
-void SIMIX_process_cleanup(smx_actor_t process)
-{
- XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
- process->waiting_synchro.get());
-
- simix_global->mutex.lock();
-
- 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->actors_to_destroy.push_back(*process);
- }
- process->context_->iwannadie = false;
-
- simix_global->mutex.unlock();
-}
-
namespace simgrid {
namespace kernel {
namespace actor {
-ActorImpl::ActorImpl(simgrid::xbt::string name, simgrid::s4u::Host* host) : name_(name), host_(host), piface_(this)
+ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(name), piface_(this)
{
pid_ = simix_process_maxpid++;
simcall.issuer = this;
delete this->context_;
}
+void ActorImpl::cleanup()
+{
+ 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;
} 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);
}
}
-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;
}
{
if (kill_time <= SIMIX_get_clock())
return;
- XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, get_cname(), host_->get_cname());
+ 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 SIMIX_timer_get_date(kill_timer);
+}
+
static void dying_daemon(int /*exit_status*/, void* data)
{
std::vector<ActorImpl*>* vect = &simix_global->daemons;
}
}
-/** This process will be terminated automatically when the last non-daemon process finishes */
+/** 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());
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(
/* 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->actors_to_run), end(simix_global->actors_to_run), 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);
}
- 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());
return nullptr;
}
- 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->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);
}
actor->code = nullptr;
if (parent_process != nullptr)
- actor->ppid_ = parent_process->pid_;
+ actor->set_ppid(parent_process->get_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);
+ actor->context_ = simix_global->context_factory->attach(actor);
/* Add properties */
if (properties != nullptr)
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;
+ 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);
if (context == nullptr)
xbt_die("Not a suitable context");
- SIMIX_process_cleanup(context->get_actor());
+ context->get_actor()->cleanup();
context->attach_stop();
}
{
SMX_EXCEPTION(actor, cat, value, msg);
- if (actor->suspended_)
+ if (actor->is_suspended())
actor->resume();
/* cancel the blocking synchro if any */