X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..b3a19f2cc0136088a395b37f4a9cfd9578815f06:/src/kernel/actor/ActorImpl.cpp?ds=sidebyside diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index bb502beb1c..b1cb37bf05 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -3,13 +3,11 @@ /* 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 "src/mc/mc_replay.hpp" #include #include #include -#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333) -#include - #include "src/kernel/EngineImpl.hpp" #if HAVE_SMPI #include "src/smpi/include/private.hpp" @@ -22,18 +20,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_actor, kernel, "Logging specific to Actor's kernel side"); -/** - * @brief Returns the current agent. - * - * This functions returns the currently running SIMIX process. - * - * @return The SIMIX process - */ -simgrid::kernel::actor::ActorImpl* SIMIX_process_self() // XBT_ATTRIB_DEPRECATED_v333 -{ - return simgrid::kernel::actor::ActorImpl::self(); -} - namespace simgrid::kernel::actor { /*------------------------- [ ActorIDTrait ] -------------------------*/ @@ -48,8 +34,8 @@ ActorImpl* ActorImpl::self() return (self_context != nullptr) ? self_context->get_actor() : nullptr; } -ActorImpl::ActorImpl(xbt::string name, s4u::Host* host, aid_t ppid) - : ActorIDTrait(std::move(name), ppid), host_(host), piface_(this) +ActorImpl::ActorImpl(const std::string& name, s4u::Host* host, aid_t ppid) + : ActorIDTrait(name, ppid), host_(host), piface_(this) { simcall_.issuer_ = this; stacksize_ = context::stack_size; @@ -80,7 +66,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host."); } - auto* actor = new ActorImpl(xbt::string(name), host, /*ppid*/ -1); + auto* actor = new ActorImpl(name, host, /*ppid*/ -1); /* Actor data */ actor->piface_.set_data(data); actor->code_ = nullptr; @@ -294,6 +280,8 @@ void ActorImpl::yield() if (not wannadie()) smpi_switch_data_segment(get_iface()); #endif + if (simgrid_mc_replay_show_backtraces) + xbt_backtrace_display_current(); } /** This actor will be terminated automatically when the last non-daemon actor finishes */ @@ -367,28 +355,28 @@ void ActorImpl::resume() activity::ActivityImplPtr ActorImpl::join(const ActorImpl* actor, double timeout) { - activity::ActivityImplPtr sleep = this->sleep(timeout); + activity::ActivityImplPtr sleep_activity = this->sleep(timeout); if (actor->wannadie() || actor->to_be_freed()) { - if (sleep->surf_action_) - sleep->surf_action_->finish(resource::Action::State::FINISHED); + if (sleep_activity->surf_action_) + sleep_activity->surf_action_->finish(resource::Action::State::FINISHED); } else { - actor->on_exit->emplace_back([sleep](bool) { - if (sleep->surf_action_) - sleep->surf_action_->finish(resource::Action::State::FINISHED); + actor->on_exit->emplace_back([sleep_activity](bool) { + if (sleep_activity->surf_action_) + sleep_activity->surf_action_->finish(resource::Action::State::FINISHED); }); } - return sleep; + return sleep_activity; } activity::ActivityImplPtr ActorImpl::sleep(double duration) { if (not host_->is_on()) - throw_exception(std::make_exception_ptr(HostFailureException( - XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there."))); + throw_exception(std::make_exception_ptr( + HostFailureException(XBT_THROW_POINT, "Host " + host_->get_name() + " failed, you cannot sleep there."))); - auto sleep = new activity::SleepImpl(); - sleep->set_name("sleep").set_host(host_).set_duration(duration).start(); - return activity::SleepImplPtr(sleep); + auto sleep_activity = new activity::SleepImpl(); + sleep_activity->set_name("sleep").set_host(host_).set_duration(duration).start(); + return activity::SleepImplPtr(sleep_activity); } void ActorImpl::throw_exception(std::exception_ptr e) @@ -430,7 +418,7 @@ void ActorImpl::set_host(s4u::Host* dest) ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) const { - auto* actor = new ActorImpl(xbt::string(name), host, get_pid()); + auto* actor = new ActorImpl(name, host, get_pid()); intrusive_ptr_add_ref(actor); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ @@ -473,9 +461,9 @@ ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, v ActorImplPtr actor; if (parent_actor != nullptr) - actor = parent_actor->init(xbt::string(name), host); + actor = parent_actor->init(name, host); else - actor = self()->init(xbt::string(name), host); + actor = self()->init(name, host); actor->piface_.set_data(data); /* actor data */ @@ -508,7 +496,7 @@ void create_maestro(const std::function& code) { auto* engine = EngineImpl::get_instance(); /* Create maestro actor and initialize it */ - auto* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr, /*ppid*/ -1); + auto* maestro = new ActorImpl(/*name*/ "", /*host*/ nullptr, /*ppid*/ -1); if (not code) { maestro->context_.reset(engine->get_context_factory()->create_context(ActorCode(), maestro)); @@ -520,16 +508,22 @@ void create_maestro(const std::function& code) engine->set_maestro(maestro); } -} // namespace simgrid::kernel::actor - -/* needs to be public and without simcall because it is called by exceptions and logging events */ -const char* SIMIX_process_self_get_name() // XBT_ATTRIB_DEPRECATED_v333 +/** (in kernel mode) unpack the simcall and activate the handler */ +void ActorImpl::simcall_handle(int times_considered) { - return simgrid::s4u::Actor::is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname(); -} + XBT_DEBUG("Handling simcall %p: %s(%ld) %s", &simcall_, simcall_.issuer_->get_cname(), simcall_.issuer_->get_pid(), + (simcall_.observer_ != nullptr ? simcall_.observer_->to_string().c_str() : simcall_.get_cname())); + if (simcall_.observer_ != nullptr) + simcall_.observer_->prepare(times_considered); + if (wannadie()) + return; -int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333 -{ - const auto* self = simgrid::kernel::actor::ActorImpl::self(); - return self != nullptr && self->is_maestro(); + xbt_assert(simcall_.call_ != Simcall::Type::NONE, "Asked to do the noop syscall on %s@%s", get_cname(), + get_host()->get_cname()); + + (*simcall_.code_)(); + if (simcall_.call_ == Simcall::Type::RUN_ANSWERED) + simcall_answer(); } + +} // namespace simgrid::kernel::actor