/* 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. */
/* 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. */
/* destroy the blocking synchro if any */
if (waiting_synchro_ != nullptr) {
waiting_synchro_->cancel();
/* destroy the blocking synchro if any */
if (waiting_synchro_ != nullptr) {
waiting_synchro_->cancel();
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_);
- auto* engine = EngineImpl::get_instance();
- xbt_assert(not engine->is_maestro(actor), "Killing maestro is a rather bad idea");
+ xbt_assert(not actor->is_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());
if (actor->finished_) {
XBT_DEBUG("Ignoring request to kill actor %s@%s that is already dead", actor->get_cname(),
actor->host_->get_cname());
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", get_cname());
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", get_cname());
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;
const auto& actors_to_run = engine->get_actors_to_run();
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;
const auto& actors_to_run = engine->get_actors_to_run();
std::find(begin(actors_to_run), end(actors_to_run), this) == end(actors_to_run),
"Actor %p should not exist in actors_to_run!", this);
engine->add_actor_to_run_list_no_check(this);
std::find(begin(actors_to_run), end(actors_to_run), this) == end(actors_to_run),
"Actor %p should not exist in actors_to_run!", this);
engine->add_actor_to_run_list_no_check(this);
-const char* SIMIX_process_self_get_name() // XBT_ATTRIB_DEPRECATD_v333
-{
- return SIMIX_is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname();
-}
-
-/** @brief Returns the process from PID. */
-smx_actor_t SIMIX_process_from_PID(aid_t pid) // XBT_ATTRIB_DEPRECATD_v331
+const char* SIMIX_process_self_get_name() // XBT_ATTRIB_DEPRECATED_v333