X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ec4bfe63855f02819ad397d3b29babf4421ea00..0c586d7f087b772253980cafd92796edcbd58c50:/src/kernel/EngineImpl.cpp diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 665e7cbf97..3a8229bb7e 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2022. 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. */ @@ -12,13 +12,13 @@ #include "mc/mc.h" #include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/StandardLinkImpl.hpp" #include "src/kernel/resource/profile/Profile.hpp" #include "src/mc/mc_record.hpp" #include "src/mc/mc_replay.hpp" #include "src/smpi/include/smpi_actor.hpp" -#include "src/surf/network_interface.hpp" #include "src/surf/xml/platf.hpp" -#include "xbt/xbt_modinter.h" /* whether initialization was already done */ +#include "xbt/xbt_modinter.h" /* whether initialization was already done */ #include #ifndef _WIN32 @@ -238,7 +238,7 @@ void EngineImpl::initialize(int* argc, char** argv) /* register a function to be called by SURF after the environment creation */ sg_platf_init(); - s4u::Engine::on_platform_created.connect([this]() { this->presolve(); }); + s4u::Engine::on_platform_created_cb([this]() { this->presolve(); }); if (config::get_value("debug/clean-atexit")) atexit(shutdown); @@ -347,6 +347,15 @@ void EngineImpl::shutdown() instance_ = nullptr; } +void EngineImpl::seal_platform() const +{ + /* sealing resources before run: links */ + for (auto const& kv : links_) + kv.second->get_iface()->seal(); + /* seal netzone root, recursively seal children netzones, hosts and disks */ + netzone_root_->seal(); +} + void EngineImpl::load_platform(const std::string& platf) { double start = xbt_os_time(); @@ -689,6 +698,8 @@ double EngineImpl::solve(double max_date) const void EngineImpl::run(double max_date) { + seal_platform(); + if (MC_record_replay_is_active()) { mc::replay(MC_record_path()); empty_trash(); @@ -846,7 +857,6 @@ void EngineImpl::run(double max_date) maestro_->kill(kv.second); } } - } while ((vetoed_activities == nullptr || vetoed_activities->empty()) && ((elapsed_time > -1.0 && not double_equals(max_date, NOW, 0.00001)) || has_actors_to_run()));