X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc32dc8200e58f87951a43bf5ba56bf116f08e62..6cc0dc3a9543b27a6f9544f60565abe9e3ab6f3c:/src/kernel/EngineImpl.hpp diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp index 451a8ec3df..f02256ca99 100644 --- a/src/kernel/EngineImpl.hpp +++ b/src/kernel/EngineImpl.hpp @@ -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. */ @@ -17,9 +17,9 @@ #include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/Synchro.hpp" #include "src/kernel/actor/ActorImpl.hpp" -#include "src/surf/SplitDuplexLinkImpl.hpp" +#include "src/kernel/resource/SplitDuplexLinkImpl.hpp" #include #include @@ -31,16 +31,9 @@ namespace simgrid { namespace kernel { -// In MC mode, the application sends these pointers to the MC -xbt_dynar_t get_actors_addr(); -xbt_dynar_t get_dead_actors_addr(); class EngineImpl { std::map> hosts_; - std::map> links_; - /* save split-duplex links separately, keep links_ with only LinkImpl* seen by the user - * members of a split-duplex are saved in the links_ */ - std::map, std::less<>> split_duplex_links_; std::unordered_map netpoints_; std::unordered_map mailboxes_; @@ -58,8 +51,7 @@ class EngineImpl { &actor::ActorImpl::kernel_destroy_list_hook>> actors_to_destroy_; #if SIMGRID_HAVE_MC - /* MCer cannot read members actor_list_ and actors_to_destroy_ above in the remote process, so we copy the info it - * needs in a dynar. + /* MCer cannot read members actor_list_ above in the remote process, so we copy the info it needs in a dynar. * FIXME: This is supposed to be a temporary hack. * A better solution would be to change the split between MCer and MCed, where the responsibility * to compute the list of the enabled transitions goes to the MCed. @@ -67,12 +59,9 @@ class EngineImpl { * These info could be published by the MCed to the MCer in a way inspired of vd.so */ xbt_dynar_t actors_vector_ = xbt_dynar_new(sizeof(actor::ActorImpl*), nullptr); - xbt_dynar_t dead_actors_vector_ = xbt_dynar_new(sizeof(actor::ActorImpl*), nullptr); #endif - std::vector> tasks; - - std::mutex mutex_; + static double now_; static EngineImpl* instance_; actor::ActorImpl* maestro_ = nullptr; context::ContextFactory* context_factory_ = nullptr; @@ -94,26 +83,17 @@ public: void initialize(int* argc, char** argv); void load_platform(const std::string& platf); void load_deployment(const std::string& file) const; + void seal_platform() const; void register_function(const std::string& name, const actor::ActorCodeFactory& code); void register_default(const actor::ActorCodeFactory& code); bool is_maestro(const actor::ActorImpl* actor) const { return actor == maestro_; } void set_maestro(actor::ActorImpl* actor) { maestro_ = actor; } actor::ActorImpl* get_maestro() const { return maestro_; } - void destroy_maestro() - { - delete maestro_; - maestro_ = nullptr; - } context::ContextFactory* get_context_factory() const { return context_factory_; } void set_context_factory(context::ContextFactory* factory) { context_factory_ = factory; } bool has_context_factory() const { return context_factory_ != nullptr; } - void destroy_context_factory() - { - delete context_factory_; - context_factory_ = nullptr; - } void context_mod_init() const; /** @@ -157,27 +137,17 @@ public: actor::ActorImpl* get_actor_by_pid(aid_t pid); void add_actor(aid_t pid, actor::ActorImpl* actor) { actor_list_[pid] = actor; } void remove_actor(aid_t pid) { actor_list_.erase(pid); } - void add_split_duplex_link(const std::string& name, std::unique_ptr link); #if SIMGRID_HAVE_MC - xbt_dynar_t get_actors_vector() const { return actors_vector_; } - xbt_dynar_t get_dead_actors_vector() const { return dead_actors_vector_; } void reset_actor_dynar() { xbt_dynar_reset(actors_vector_); } void add_actor_to_dynar(actor::ActorImpl* actor) { xbt_dynar_push_as(actors_vector_, actor::ActorImpl*, actor); } - void add_dead_actor_to_dynar(actor::ActorImpl* actor) - { - xbt_dynar_push_as(dead_actors_vector_, actor::ActorImpl*, actor); - } #endif const std::map& get_actor_list() const { return actor_list_; } const std::vector& get_actors_to_run() const { return actors_to_run_; } const std::vector& get_actors_that_ran() const { return actors_that_ran_; } - std::mutex& get_mutex() { return mutex_; } - bool execute_tasks(); - void add_task(xbt::Task&& t) { tasks.push_back(std::move(t)); } - void wake_all_waiting_actors() const; + void handle_ended_actions() const; /** * Garbage collection * @@ -190,7 +160,7 @@ public: /* @brief Finish simulation initialization * This function must be called before the first call to solve() */ - void presolve(); + void presolve() const; /** @brief Performs a part of the simulation * @param max_date Maximum date to update the simulation to, or -1 * @return the elapsed time, or -1.0 if no event could be executed @@ -200,10 +170,10 @@ public: * when you call solve(). * Note that the returned elapsed time can be zero. */ - double solve(double max_date); + double solve(double max_date) const; - /** @brief Run the main simulation loop. */ - void run(); + /** @brief Run the main simulation loop until the specified date (or infinitly if max_date is negative). */ + void run(double max_date); /** @brief Return the current time in milliseconds. */ static double get_clock();