X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6cc0dc3a9543b27a6f9544f60565abe9e3ab6f3c..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/src/kernel/EngineImpl.hpp diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp index f02256ca99..d2d410897b 100644 --- a/src/kernel/EngineImpl.hpp +++ b/src/kernel/EngineImpl.hpp @@ -29,11 +29,9 @@ #include #include -namespace simgrid { -namespace kernel { +namespace simgrid::kernel { class EngineImpl { - std::map> hosts_; std::unordered_map netpoints_; std::unordered_map mailboxes_; @@ -50,16 +48,6 @@ class EngineImpl { boost::intrusive::member_hook, &actor::ActorImpl::kernel_destroy_list_hook>> actors_to_destroy_; -#if SIMGRID_HAVE_MC - /* 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. - * That way, the MCer would not need to have the list of actors on its side. - * 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); -#endif static double now_; static EngineImpl* instance_; @@ -138,11 +126,6 @@ public: void add_actor(aid_t pid, actor::ActorImpl* actor) { actor_list_[pid] = actor; } void remove_actor(aid_t pid) { actor_list_.erase(pid); } -#if SIMGRID_HAVE_MC - 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); } -#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_; } @@ -179,7 +162,6 @@ public: static double get_clock(); }; -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel #endif