-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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. */
#include "src/surf/xml/platf.hpp"
#if SIMGRID_HAVE_MC
-#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/AppSide.hpp"
#endif
+#include <memory>
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)");
namespace simgrid {
namespace simix {
-config::Flag<double> cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
+config::Flag<bool> cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
} // namespace simix
} // namespace simgrid
std::raise(signum);
}
-unsigned char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */
+std::array<unsigned char, SIGSTKSZ> sigsegv_stack; /* alternate stack for SIGSEGV handler */
/**
* Install signal handler for SIGSEGV. Check that nobody has already installed
*/
static void install_segvhandler()
{
- stack_t stack;
stack_t old_stack;
- stack.ss_sp = sigsegv_stack;
- stack.ss_size = sizeof sigsegv_stack;
- stack.ss_flags = 0;
- if (sigaltstack(&stack, &old_stack) == -1) {
+ if (simgrid::kernel::context::Context::install_sigsegv_stack(&old_stack, true) == -1) {
XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno));
return;
}
Timer* Timer::set(double date, xbt::Task<void()>&& callback)
{
- Timer* timer = new Timer(date, std::move(callback));
+ auto* timer = new Timer(date, std::move(callback));
timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
return timer;
}
}
/** Wake up all actors waiting for a Surf action to finish */
-void Global::wake_all_waiting_actors()
+void Global::wake_all_waiting_actors() const
{
for (auto const& model : all_existing_models) {
kernel::resource::Action* action;
}
}
-void Global::display_all_actor_status()
+void Global::display_all_actor_status() const
{
XBT_INFO("%zu actors are still running, waiting for something.", process_list.size());
/* List the actors and their state */
for (auto const& kv : process_list) {
kernel::actor::ActorImpl* actor = kv.second;
- if (actor->waiting_synchro) {
+ if (actor->waiting_synchro_) {
const char* synchro_description = "unknown";
- // we don't care about the Activity type to get its name, use RawImpl
- const char* name = boost::static_pointer_cast<kernel::activity::ActivityImpl_T<kernel::activity::RawImpl>>(
- actor->waiting_synchro)
- ->get_cname();
- if (boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(actor->waiting_synchro_) != nullptr)
synchro_description = "execution";
- if (boost::dynamic_pointer_cast<kernel::activity::CommImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::CommImpl>(actor->waiting_synchro_) != nullptr)
synchro_description = "communication";
- if (boost::dynamic_pointer_cast<kernel::activity::SleepImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::SleepImpl>(actor->waiting_synchro_) != nullptr)
synchro_description = "sleeping";
- if (boost::dynamic_pointer_cast<kernel::activity::RawImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::RawImpl>(actor->waiting_synchro_) != nullptr)
synchro_description = "synchronization";
- if (boost::dynamic_pointer_cast<kernel::activity::IoImpl>(actor->waiting_synchro) != nullptr)
+ if (boost::dynamic_pointer_cast<kernel::activity::IoImpl>(actor->waiting_synchro_) != nullptr)
synchro_description = "I/O";
- XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %p (%s) in state %d to finish", actor->get_pid(),
- actor->get_cname(), actor->get_host()->get_cname(), synchro_description, actor->waiting_synchro.get(),
- name, (int)actor->waiting_synchro->state_);
+ XBT_INFO("Actor %ld (%s@%s): waiting for %s activity %#zx (%s) in state %d to finish", actor->get_pid(),
+ actor->get_cname(), actor->get_host()->get_cname(), synchro_description,
+ (xbt_log_no_loc ? (size_t)0xDEADBEEF : (size_t)actor->waiting_synchro_.get()),
+ actor->waiting_synchro_->get_cname(), (int)actor->waiting_synchro_->state_);
} else {
XBT_INFO("Actor %ld (%s@%s)", actor->get_pid(), actor->get_cname(), actor->get_host()->get_cname());
}
} // namespace simix
} // namespace simgrid
-static simgrid::simix::ActorCode maestro_code;
+static simgrid::kernel::actor::ActorCode maestro_code;
void SIMIX_set_maestro(void (*code)(void*), void* data)
{
#ifdef _WIN32
#if SIMGRID_HAVE_MC
// The communication initialization is done ASAP.
// We need to communicate initialization of the different layers to the model-checker.
- simgrid::mc::Client::initialize();
+ simgrid::mc::AppSide::initialize();
#endif
if (simix_global == nullptr) {
surf_init(argc, argv); /* Initialize SURF structures */
- simix_global.reset(new simgrid::simix::Global());
+ simix_global = std::make_unique<simgrid::simix::Global>();
simix_global->maestro_ = nullptr;
SIMIX_context_mod_init();
}
#if HAVE_SMPI
- if (simix_global->process_list.size() > 0) {
+ if (not simix_global->process_list.empty()) {
if(smpi_process()->initialized()){
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
}else{
*/
for (auto const& actor : simix_global->actors_that_ran) {
- if (actor->simcall.call_ != SIMCALL_NONE) {
+ if (actor->simcall_.call_ != SIMCALL_NONE) {
actor->simcall_handle(0);
}
}
XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(),
simix_global->actors_to_run.size());
- } while (time > -1.0 || not simix_global->actors_to_run.empty());
- if (not simix_global->process_list.empty()) {
- if (simix_global->process_list.size() <= simix_global->daemons.size()) {
- XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) "
- "once the simulation is over. Please fix your on_exit() functions.");
- } else {
- XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
+ if (time < 0. && simix_global->actors_to_run.empty() && not simix_global->process_list.empty()) {
+ if (simix_global->process_list.size() <= simix_global->daemons.size()) {
+ XBT_CRITICAL("Oops! Daemon actors cannot do any blocking activity (communications, synchronization, etc) "
+ "once the simulation is over. Please fix your on_exit() functions.");
+ } else {
+ XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
+ }
+ simix_global->display_all_actor_status();
+ simgrid::s4u::Engine::on_deadlock();
+ for (auto const& kv : simix_global->process_list) {
+ XBT_DEBUG("Kill %s", kv.second->get_cname());
+ simix_global->maestro_->kill(kv.second);
+ }
}
- simix_global->display_all_actor_status();
- simgrid::s4u::Engine::on_deadlock();
- xbt_abort();
- }
+ } while (time > -1.0 || not simix_global->actors_to_run.empty());
+
+ if (not simix_global->process_list.empty())
+ THROW_IMPOSSIBLE;
+
simgrid::s4u::Engine::on_simulation_end();
}
{
if (simix_global == nullptr) // SimDag
return true;
- simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
+ const simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
return self == nullptr || self == simix_global->maestro_;
}
