#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_config.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_replay.hpp"
+#include "src/simgrid/math_utils.h"
+#include "src/simgrid/sg_config.hpp"
#include "src/smpi/include/smpi_actor.hpp"
-#include "src/kernel/xml/platf.hpp"
-#include "xbt/module.h"
-#include "xbt/xbt_modinter.h" /* whether initialization was already done */
-
-#include <boost/algorithm/string/predicate.hpp>
-#include <dlfcn.h>
#if SIMGRID_HAVE_MC
#include "src/mc/remote/AppSide.hpp"
#endif
+#include "xbt/log.hpp"
+
+#include <boost/algorithm/string/predicate.hpp>
+#include <dlfcn.h>
+
XBT_LOG_NEW_DEFAULT_CATEGORY(ker_engine, "Logging specific to Engine (kernel)");
namespace simgrid::kernel {
}
}
+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()
// 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();
+ simgrid::mc::AppSide::get(); // To ensure that it's initialized
#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();
install_signal_handlers();
- /* register a function to be called by SURF after the environment creation */
+ /* 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);
}
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();
}
}
}
XBT_DEBUG("Looking for next event in all models");
for (auto model : models_) {
- if (not model->next_occurring_event_is_idempotent()) {
+ if (not model->next_occurring_event_is_idempotent())
continue;
- }
+
double next_event = model->next_occurring_event(now_);
if ((time_delta < 0.0 || next_event < time_delta) && next_event >= 0.0) {
time_delta = next_event;
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);
{
seal_platform();
+ XBT_DEBUG("Running the main loop until t=%.3f in mode %s", max_date,
+ to_c_str(simgrid::mc::get_model_checking_mode()));
+
if (MC_is_active()) {
#if SIMGRID_HAVE_MC
mc::AppSide::get()->main_loop();