-/* 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. */
#include "src/smpi/include/smpi_actor.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
-#include "src/surf/StorageImpl.hpp"
#include "src/surf/xml/platf.hpp"
+#include "simgrid/kernel/resource/Model.hpp"
+
#if SIMGRID_HAVE_MC
#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<bool> cfg_verbose_exit{"debug/verbose-exit", {"verbose-exit"}, "Display the actor status at exit", true};
+config::Flag<bool> cfg_verbose_exit{"debug/verbose-exit", "Display the actor status at exit", true};
} // namespace simix
} // namespace simgrid
XBT_INFO("CTRL-C pressed. The current status will be displayed before exit (disable that behavior with option "
"'debug/verbose-exit').");
simix_global->display_all_actor_status();
- }
- else {
+ } else {
XBT_INFO("CTRL-C pressed, exiting. Hiding the current process status since 'debug/verbose-exit' is set to false.");
}
exit(1);
"Minimal Working Example (MWE) reproducing your problem and a full backtrace\n"
"of the fault captured with gdb or valgrind.\n",
smx_context_stack_size / 1024);
- } else if (siginfo->si_signo == SIGSEGV) {
+ } else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
if (smpi_enabled() && smpi_cfg_privatization() == SmpiPrivStrategies::NONE) {
std::raise(signum);
}
-unsigned char sigsegv_stack[SIGSTKSZ]; /* alternate stack for SIGSEGV handler */
-
/**
* Install signal handler for SIGSEGV. Check that nobody has already installed
* its own handler. For example, the Java VM does this.
*/
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;
}
struct sigaction action;
struct sigaction old_action;
action.sa_sigaction = &segvhandler;
- action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
+ action.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
sigemptyset(&action.sa_mask);
/* Linux tend to raise only SIGSEGV where other systems also raise SIGBUS on severe error */
Timer* Timer::set(double date, xbt::Task<void()>&& callback)
{
- Timer* timer = new Timer(date, std::move(callback));
- timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
+ auto* timer = new Timer(date, std::move(callback));
+ timer->handle_ = simix_timers().emplace(std::make_pair(date, timer));
return timer;
}
/** @brief cancels a timer that was added earlier */
void Timer::remove()
{
- simix_timers.erase(handle_);
+ simix_timers().erase(handle_);
delete this;
}
/** Wake up all actors waiting for a Surf action to finish */
void Global::wake_all_waiting_actors() const
{
- for (auto const& model : all_existing_models) {
+ for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) {
kernel::resource::Action* action;
XBT_DEBUG("Handling the failed actions (if any)");
}
}
-config::Flag<double> cfg_breakpoint{
- "debug/breakpoint", {"simix/breakpoint"}, "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
+config::Flag<double> cfg_breakpoint{"debug/breakpoint",
+ "When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
} // namespace simix
} // namespace simgrid
void SIMIX_set_maestro(void (*code)(void*), void* data)
{
#ifdef _WIN32
- XBT_INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if you need that feature");
+ XBT_INFO("WARNING, SIMIX_set_maestro is believed to not work on windows. Please help us investigating this issue if "
+ "you need that feature");
#endif
maestro_code = std::bind(code, data);
}
* @ingroup SIMIX_API
* @brief Initialize SIMIX internal data.
*/
-void SIMIX_global_init(int *argc, char **argv)
+void SIMIX_global_init(int* argc, char** argv)
{
#if SIMGRID_HAVE_MC
// The communication initialization is done ASAP.
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();
atexit(SIMIX_clean);
}
-int smx_cleaned = 0;
/**
* @ingroup SIMIX_API
* @brief Clean the SIMIX simulation
*/
void SIMIX_clean()
{
+ static bool smx_cleaned = false;
if (smx_cleaned)
return; // to avoid double cleaning by java and C
- smx_cleaned = 1;
+ smx_cleaned = true;
XBT_DEBUG("SIMIX_clean called. Simulation's over.");
if (not simix_global->actors_to_run.empty() && SIMIX_get_clock() <= 0.0) {
XBT_CRITICAL(" ");
}
#if HAVE_SMPI
- if (simix_global->process_list.size() > 0) {
- if(smpi_process()->initialized()){
+ if (not simix_global->process_list.empty()) {
+ if (smpi_process()->initialized()) {
xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
- }else{
+ } else {
XBT_WARN("Process called exit when leaving - Skipping cleanups");
return;
}
/* Exit the SIMIX network module */
SIMIX_mailbox_exit();
- while (not simgrid::simix::simix_timers.empty()) {
- delete simgrid::simix::simix_timers.top().second;
- simgrid::simix::simix_timers.pop();
+ while (not simgrid::simix::simix_timers().empty()) {
+ delete simgrid::simix::simix_timers().top().second;
+ simgrid::simix::simix_timers().pop();
}
/* Free the remaining data structures */
simix_global->actors_to_run.clear();
*/
double SIMIX_get_clock()
{
- if(MC_is_active() || MC_record_replay_is_active()){
+ if (MC_is_active() || MC_record_replay_is_active()) {
return MC_process_clock_get(SIMIX_process_self());
- }else{
+ } else {
return surf_get_clock();
}
}
static bool SIMIX_execute_timers()
{
bool result = false;
- while (not simgrid::simix::simix_timers.empty() && SIMIX_get_clock() >= simgrid::simix::simix_timers.top().first) {
+ while (not simgrid::simix::simix_timers().empty() &&
+ SIMIX_get_clock() >= simgrid::simix::simix_timers().top().first) {
result = true;
// FIXME: make the timers being real callbacks (i.e. provide dispatchers that read and expand the args)
- smx_timer_t timer = simgrid::simix::simix_timers.top().second;
- simgrid::simix::simix_timers.pop();
+ smx_timer_t timer = simgrid::simix::simix_timers().top().second;
+ simgrid::simix::simix_timers().pop();
timer->callback();
delete timer;
}
void SIMIX_run()
{
if (MC_record_replay_is_active()) {
- simgrid::mc::replay(MC_record_path);
+ simgrid::mc::replay(MC_record_path());
return;
}
*/
for (auto const& actor : simix_global->actors_that_ran) {
- if (actor->simcall_.call_ != SIMCALL_NONE) {
+ if (actor->simcall_.call_ != simgrid::simix::Simcall::NONE) {
actor->simcall_handle(0);
}
}
