-/* 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. */
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()
{
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) {
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<const simgrid::TimeoutException*>(&e) != nullptr) {
+ std::throw_with_nested(simgrid::TimeoutException(XBT_THROW_POINT, "Timeout raised in kernel mode."));
+
+ } else if (dynamic_cast<const simgrid::HostFailureException*>(&e) != nullptr) {
+ std::throw_with_nested(simgrid::HostFailureException(XBT_THROW_POINT, "HostFailure raised in kernel mode."));
+
+ } else if (dynamic_cast<const simgrid::NetworkFailureException*>(&e) != nullptr) {
+ std::throw_with_nested(
+ simgrid::NetworkFailureException(XBT_THROW_POINT, "NetworkFailure raised in kernel mode."));
+
+ } else if (dynamic_cast<const simgrid::StorageFailureException*>(&e) != nullptr) {
+ std::throw_with_nested(
+ simgrid::StorageFailureException(XBT_THROW_POINT, "StorageFailure raised in kernel mode."));
+
+ } else if (dynamic_cast<const simgrid::VmFailureException*>(&e) != nullptr) {
+ std::throw_with_nested(simgrid::VmFailureException(XBT_THROW_POINT, "VmFailure raised in kernel mode."));
+
+ } else if (dynamic_cast<const simgrid::CancelException*>(&e) != nullptr) {
+ std::throw_with_nested(simgrid::CancelException(XBT_THROW_POINT, "Cancel raised in kernel mode."));
+
+ } else if (dynamic_cast<const simgrid::TracingError*>(&e) != nullptr) {
+ std::throw_with_nested(simgrid::TracingError(XBT_THROW_POINT, "Tracing error raised in kernel mode."));
+
+ } else if (dynamic_cast<const simgrid::ParseError*>(&e) != nullptr) {
+ auto pe = dynamic_cast<const simgrid::ParseError*>(&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_) {
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);
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),
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,
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<std::string, std::string>* 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); });
