X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e599303392d7cf5795927906bc44619ab60dfcaf..23802cce688def4bcaa49c5723b627b261ca5092:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 4e0162f49e..cb929b9ae0 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -40,10 +40,22 @@ namespace kernel { namespace actor { static unsigned long maxpid = 0; -int get_maxpid() +unsigned long get_maxpid() { return maxpid; } +ActorImpl* ActorImpl::by_PID(aid_t PID) +{ + auto item = simix_global->process_list.find(PID); + if (item != simix_global->process_list.end()) + return item->second; + + // Search the trash + for (auto& a : simix_global->actors_to_destroy) + if (a.get_pid() == PID) + return &a; + return nullptr; // Not found, even in the trash +} ActorImpl* ActorImpl::self() { @@ -62,7 +74,7 @@ ActorImpl::ActorImpl(xbt::string name, s4u::Host* host) : host_(host), name_(std 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 @@ -85,7 +97,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h 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; @@ -112,7 +124,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h 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); } @@ -153,7 +165,7 @@ void ActorImpl::cleanup() if (has_to_auto_restart() && not get_host()->is_on()) { XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", get_host()->get_cname(), get_cname()); - watched_hosts.insert(get_host()->get_name()); + watched_hosts().insert(get_host()->get_name()); } if (on_exit) { @@ -190,7 +202,7 @@ void ActorImpl::cleanup() 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(); } @@ -227,7 +239,7 @@ void ActorImpl::exit() 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_) { @@ -252,7 +264,7 @@ void ActorImpl::kill(ActorImpl* actor) } } -void ActorImpl::kill_all() +void ActorImpl::kill_all() const { for (auto const& kv : simix_global->process_list) if (kv.second != this) @@ -270,7 +282,7 @@ void ActorImpl::set_kill_time(double kill_time) }); } -double ActorImpl::get_kill_time() +double ActorImpl::get_kill_time() const { return kill_timer_ ? kill_timer_->get_date() : 0; } @@ -306,11 +318,42 @@ void ActorImpl::yield() XBT_DEBUG("Wait, maestro left me an exception"); std::exception_ptr exception = std::move(exception_); exception_ = nullptr; - std::rethrow_exception(std::move(exception)); + try { + std::rethrow_exception(std::move(exception)); + } catch (const simgrid::Exception& e) { + if (dynamic_cast(&e) != nullptr) { + std::throw_with_nested(simgrid::TimeoutException(XBT_THROW_POINT, "Timeout raised in kernel mode.")); + + } else if (dynamic_cast(&e) != nullptr) { + std::throw_with_nested(simgrid::HostFailureException(XBT_THROW_POINT, "HostFailure raised in kernel mode.")); + + } else if (dynamic_cast(&e) != nullptr) { + std::throw_with_nested( + simgrid::NetworkFailureException(XBT_THROW_POINT, "NetworkFailure raised in kernel mode.")); + + } else if (dynamic_cast(&e) != nullptr) { + std::throw_with_nested( + simgrid::StorageFailureException(XBT_THROW_POINT, "StorageFailure raised in kernel mode.")); + + } else if (dynamic_cast(&e) != nullptr) { + std::throw_with_nested(simgrid::VmFailureException(XBT_THROW_POINT, "VmFailure raised in kernel mode.")); + + } else if (dynamic_cast(&e) != nullptr) { + std::throw_with_nested(simgrid::CancelException(XBT_THROW_POINT, "Cancel raised in kernel mode.")); + + } else if (dynamic_cast(&e) != nullptr) { + std::throw_with_nested(simgrid::TracingError(XBT_THROW_POINT, "Tracing error raised in kernel mode.")); + + } else if (dynamic_cast(&e) != nullptr) { + auto pe = dynamic_cast(&e); + std::throw_with_nested(simgrid::ParseError(pe->file_, pe->line_, "Parse error raised in kernel mode.")); + } + THROW_IMPOSSIBLE; + } } if (SMPI_switch_data_segment && not finished_) { - SMPI_switch_data_segment(iface()); + SMPI_switch_data_segment(get_iface()); } } @@ -350,13 +393,12 @@ s4u::Actor* ActorImpl::restart() context::Context::self()->get_actor()->kill(this); // start the new actor - ActorImplPtr actor = - ActorImpl::create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr); + ActorImplPtr actor = ActorImpl::create(arg.name, arg.code, arg.data, arg.host, arg.properties.get(), nullptr); *actor->on_exit = std::move(*arg.on_exit); actor->set_kill_time(arg.kill_time); actor->set_auto_restart(arg.auto_restart); - return actor->ciface(); + return actor->get_ciface(); } void ActorImpl::suspend() @@ -437,8 +479,8 @@ 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_, get_cname(), this); - xbt_assert(simcall_.call_ != SIMCALL_NONE); - simcall_.call_ = SIMCALL_NONE; + xbt_assert(simcall_.call_ != simix::Simcall::NONE); + simcall_.call_ = simix::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), @@ -454,14 +496,14 @@ void ActorImpl::set_host(s4u::Host* dest) 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); } @@ -494,7 +536,8 @@ ActorImpl* ActorImpl::start(const ActorCode& code) } ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host, - const std::unordered_map* properties, ActorImpl* parent_actor) + const std::unordered_map* properties, + const ActorImpl* parent_actor) { XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname()); @@ -519,7 +562,7 @@ ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, v void create_maestro(const std::function& 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)); @@ -540,8 +583,7 @@ int SIMIX_process_count() // XBT_ATTRIB_DEPRECATED_v329 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(); @@ -551,8 +593,7 @@ void* SIMIX_process_self_get_data() 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); } @@ -564,25 +605,10 @@ const char* SIMIX_process_self_get_name() return SIMIX_is_maestro() ? "maestro" : simgrid::kernel::actor::ActorImpl::self()->get_cname(); } -/** - * @brief Calling this function makes the process to yield. - * - * Only the current process can call this function, giving back the control to maestro. - * - * @param self the current process - */ - /** @brief Returns the process from PID. */ smx_actor_t SIMIX_process_from_PID(aid_t PID) { - auto item = simix_global->process_list.find(PID); - if (item == simix_global->process_list.end()) { - for (auto& a : simix_global->actors_to_destroy) - if (a.get_pid() == PID) - return &a; - return nullptr; // Not found, even in the trash - } - return item->second; + return simgrid::kernel::actor::ActorImpl::by_PID(PID); } void SIMIX_process_on_exit(smx_actor_t actor, @@ -592,30 +618,6 @@ void SIMIX_process_on_exit(smx_actor_t actor, actor->on_exit->emplace_back(fun); } -/** @brief Restart a process, starting it again from the beginning. */ -/** - * @ingroup simix_process_management - * @brief Creates and runs a new SIMIX process. - * - * The structure and the corresponding thread are created and put in the list of ready processes. - * - * @param name a name for the process. It is for user-level information and can be nullptr. - * @param code the main function of the process - * @param data a pointer to any data one may want to attach to the new object. It is for user-level information and can - * be nullptr. - * It can be retrieved with the method ActorImpl::getUserData(). - * @param host where the new agent is executed. - * @param properties the properties of the process - */ -smx_actor_t simcall_process_create(const std::string& name, const simgrid::kernel::actor::ActorCode& code, void* data, - sg_host_t host, std::unordered_map* properties) -{ - smx_actor_t self = simgrid::kernel::actor::ActorImpl::self(); - return simgrid::kernel::actor::simcall([&name, &code, data, host, properties, self] { - return simgrid::kernel::actor::ActorImpl::create(name, code, data, host, properties, self).get(); - }); -} - 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); });