#include <simgrid/kernel/routing/NetPoint.hpp>
#include <simgrid/kernel/routing/NetZoneImpl.hpp>
#include <simgrid/s4u/Host.hpp>
-#include <simgrid/sg_config.hpp>
-#include "mc/mc.h"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/StandardLinkImpl.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
+#include "src/kernel/xml/platf.hpp"
+#include "src/mc/mc.h"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_replay.hpp"
+#include "src/mc/remote/AppSide.hpp"
+#include "src/simgrid/math_utils.h"
+#include "src/simgrid/sg_config.hpp"
#include "src/smpi/include/smpi_actor.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "xbt/module.h"
-#include "xbt/xbt_modinter.h" /* whether initialization was already done */
+
+#include "xbt/log.hpp"
#include <boost/algorithm/string/predicate.hpp>
#include <dlfcn.h>
-#if SIMGRID_HAVE_MC
-#include "src/mc/remote/AppSide.hpp"
-#endif
-
XBT_LOG_NEW_DEFAULT_CATEGORY(ker_engine, "Logging specific to Engine (kernel)");
namespace simgrid::kernel {
"If you think you've found a bug in SimGrid, please report it along with a\n"
"Minimal Working Example (MWE) reproducing your problem and a full backtrace\n"
"of the fault captured with gdb or valgrind.\n",
- simgrid::kernel::context::stack_size / 1024);
+ simgrid::kernel::context::Context::stack_size / 1024);
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
std::raise(signum);
}
-/**
- * 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()
+static void install_signal_handlers()
{
- stack_t old_stack;
+ /* Install signal handler for SIGINT */
+ std::signal(SIGINT, inthandler);
- if (simgrid::kernel::context::Context::install_sigsegv_stack(&old_stack, true) == -1) {
+ /* Install signal handler for SIGSEGV */
+ if (simgrid::kernel::context::Context::install_sigsegv_stack(true) == -1) {
XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno));
return;
}
- if (not(old_stack.ss_flags & SS_DISABLE)) {
- XBT_DEBUG("An alternate stack was already installed (sp=%p, size=%zu, flags=%x). Restore it.", old_stack.ss_sp,
- old_stack.ss_size, (unsigned)old_stack.ss_flags);
- sigaltstack(&old_stack, nullptr);
- }
struct sigaction action;
- struct sigaction old_action;
action.sa_sigaction = &segvhandler;
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 */
for (int sig : {SIGSEGV, SIGBUS}) {
- if (sigaction(sig, &action, &old_action) == -1) {
+ if (sigaction(sig, &action, nullptr) == -1)
XBT_WARN("Failed to register signal handler for signal %d: %s", sig, strerror(errno));
- continue;
- }
- if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) {
- XBT_DEBUG("A signal handler was already installed for signal %d (%p). Restore it.", sig,
- (old_action.sa_flags & SA_SIGINFO) ? (void*)old_action.sa_sigaction : (void*)old_action.sa_handler);
- sigaction(sig, &old_action, nullptr);
- }
}
}
+static simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
+ "debug/clean-atexit", "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.", true};
+
namespace simgrid::kernel {
EngineImpl::~EngineImpl()
xbt_assert(EngineImpl::instance_ == nullptr,
"It is currently forbidden to create more than one instance of kernel::EngineImpl");
EngineImpl::instance_ = this;
-#if SIMGRID_HAVE_MC
// The communication initialization is done ASAP, as we need to get some init parameters from the MC for different
// layers. But instance_ needs to be created, as we send the address of some of its fields to the MC that wants to
// read them directly.
simgrid::mc::AppSide::initialize();
-#endif
- if (xbt_initialized == 0) {
- xbt_init(argc, argv);
+ if (static bool inited = false; not inited) {
+ inited = true;
+ xbt_log_init(argc, argv);
+
+ simgrid::xbt::install_exception_handler();
sg_config_init(argc, argv);
}
+ cmdline_.assign(argv, argv + *argc);
+
instance_->context_mod_init();
- /* Prepare to display some more info when dying on Ctrl-C pressing */
- std::signal(SIGINT, inthandler);
- install_segvhandler();
+ install_signal_handlers();
- /* register a function to be called by SURF after the environment creation */
- sg_platf_init();
+ /* register a function to be called after the environment creation */
s4u::Engine::on_platform_created_cb([this]() { this->presolve(); });
- if (config::get_value<bool>("debug/clean-atexit"))
+ if (cfg_dbg_clean_atexit)
atexit(shutdown);
}
}
#endif
- /* select the context factory to use to create the contexts */
- if (context::ContextFactory::initializer) { // Give Java a chance to hijack the factory mechanism
- instance_->set_context_factory(context::ContextFactory::initializer());
- return;
- }
/* use the factory specified by --cfg=contexts/factory:value */
for (auto const& [factory_name, factory] : context_factories)
if (context_factory_name == factory_name) {
}
tmgr_finalize();
- sg_platf_exit();
+ sg_platf_parser_finalize();
delete instance_;
instance_ = nullptr;
void EngineImpl::load_deployment(const std::string& file) const
{
- sg_platf_exit();
- sg_platf_init();
+ sg_platf_parser_finalize();
- surf_parse_open(file);
- surf_parse();
- surf_parse_close();
+ simgrid_parse_open(file);
+ simgrid_parse();
+ simgrid_parse_close();
}
void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)
models_prio_[model_name] = std::move(model);
}
-/** Wake up all actors waiting for a Surf action to finish */
+/** Wake up all actors waiting for an action to finish */
void EngineImpl::handle_ended_actions() const
{
for (auto const& model : models_) {
if (action->get_activity()->get_actor() == maestro_)
action->get_activity()->get_iface()->complete(s4u::Activity::State::FAILED);
- activity::ActivityImplPtr(action->get_activity())->post();
+ activity::ActivityImplPtr(action->get_activity())->finish();
}
}
XBT_DEBUG("Handling the terminated actions (if any)");
if (action->get_activity()->get_actor() == maestro_)
action->get_activity()->get_iface()->complete(s4u::Activity::State::FINISHED);
- activity::ActivityImplPtr(action->get_activity())->post();
+ activity::ActivityImplPtr(action->get_activity())->finish();
}
}
}
while (auto* event = profile::future_evt_set.pop_leq(next_event_date, &value, &resource)) {
if(value<0)
continue;
- if (resource->is_used() || (watched_hosts().find(resource->get_cname()) != watched_hosts().end())) {
+ if (resource->is_used()) {
time_delta = next_event_date - now_;
XBT_DEBUG("This event invalidates the next_occurring_event() computation of models. Next event set to %f",
time_delta);
}
- // FIXME: I'm too lame to update now_ live, so I change it and restore it so that the real update with surf_min
- // will work
+ // FIXME: I'm too lame to update now_ live, so I change it and restore it so that the real update works
double round_start = now_;
now_ = next_event_date;
/* update state of the corresponding resource to the new value. Does not touch lmm.
seal_platform();
if (MC_is_active()) {
-#if SIMGRID_HAVE_MC
mc::AppSide::get()->main_loop();
-#else
- xbt_die("MC_is_active() is not supposed to return true in non-MC settings");
-#endif
THROW_IMPOSSIBLE; // main_loop never returns
}