X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c59fa1fcce83a7a3c956f7d2996afb5074f9d1d7..0cf6c791bd19e8b9acf8e220c5c62216c7fc2559:/src/kernel/EngineImpl.cpp diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index efbd8812a2..a5b2d5718e 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -8,26 +8,27 @@ #include #include #include -#include -#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/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 -#include #if SIMGRID_HAVE_MC #include "src/mc/remote/AppSide.hpp" #endif +#include "xbt/log.hpp" + +#include +#include + XBT_LOG_NEW_DEFAULT_CATEGORY(ker_engine, "Logging specific to Engine (kernel)"); namespace simgrid::kernel { @@ -99,7 +100,7 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/) "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 @@ -138,6 +139,9 @@ static void install_signal_handlers() } } +static simgrid::config::Flag 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() @@ -171,24 +175,28 @@ void EngineImpl::initialize(int* argc, char** argv) // 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 */ - 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("debug/clean-atexit")) + if (cfg_dbg_clean_atexit) atexit(shutdown); } @@ -272,7 +280,7 @@ void EngineImpl::shutdown() } tmgr_finalize(); - sg_platf_exit(); + sg_platf_parser_finalize(); delete instance_; instance_ = nullptr; @@ -312,12 +320,11 @@ void EngineImpl::load_platform(const std::string& platf) 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) @@ -343,7 +350,7 @@ void EngineImpl::add_model(std::shared_ptr model, const std::ve 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_) { @@ -355,7 +362,7 @@ void EngineImpl::handle_ended_actions() const 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)"); @@ -368,7 +375,7 @@ void EngineImpl::handle_ended_actions() const 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(); } } } @@ -553,13 +560,12 @@ double EngineImpl::solve(double max_date) const 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.