X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f53e33771f1e35a28358934a12e3a057fe56a4c..c6d3ba3ec09d425c8b31cc0e9c333dee5296a94b:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 6d73ea2d7d..e6aa819a2e 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -1,6 +1,6 @@ /* s4u::Engine Simulation Engine and global functions. */ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ @@ -64,7 +64,9 @@ Engine::~Engine() /** @brief Retrieve the engine singleton */ Engine* Engine::get_instance() { - return get_instance(nullptr, nullptr); + int argc = 0; + char* argv = nullptr; + return get_instance(&argc, &argv); } Engine* Engine::get_instance(int* argc, char** argv) { @@ -112,6 +114,16 @@ void Engine::load_platform(const std::string& platf) const pimpl->load_platform(platf); } +/** + * @brief Seals the platform, finishing the creation of its resources. + * + * This method is optional. The seal() is done automatically when you call Engine::run. + */ +void Engine::seal_platform() const +{ + pimpl->seal_platform(); +} + /** Registers the main function of an actor that will be launched from the deployment file */ void Engine::register_function(const std::string& name, const std::function& code) { @@ -321,12 +333,6 @@ void Engine::run() const } void Engine::run_until(double max_date) const { - /* sealing resources before run: links */ - for (auto* link : get_all_links()) - link->seal(); - /* seal netzone root, recursively seal children netzones, hosts and disks */ - get_netzone_root()->seal(); - /* Clean IO before the run */ fflush(stdout); fflush(stderr); @@ -338,7 +344,7 @@ void Engine::run_until(double max_date) const } } -void Engine::track_vetoed_activities(std::set* vetoed_activities) +void Engine::track_vetoed_activities(std::set* vetoed_activities) const { Activity::set_vetoed_activities(vetoed_activities); }