X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6e4a812f0edc58eeb342f0c990122eabf51e6ec..af770fbd26eae6c56112c52e6a83fc6849f0bc78:/src/kernel/EngineImpl.hpp

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index b3259ce1ef..0ddfc52e89 100644
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -31,9 +31,6 @@
 
 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<std::string, s4u::Host*, std::less<>> hosts_;
@@ -58,8 +55,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 +63,8 @@ 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<xbt::Task<void()>> tasks;
-
-  std::mutex mutex_;
   static EngineImpl* instance_;
   actor::ActorImpl* maestro_ = nullptr;
   context::ContextFactory* context_factory_ = nullptr;
@@ -105,11 +97,6 @@ public:
   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;
   /**
@@ -156,24 +143,15 @@ public:
   void add_split_duplex_link(const std::string& name, std::unique_ptr<resource::SplitDuplexLinkImpl> 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<aid_t, actor::ActorImpl*>& get_actor_list() const { return actor_list_; }
   const std::vector<actor::ActorImpl*>& get_actors_to_run() const { return actors_to_run_; }
   const std::vector<actor::ActorImpl*>& get_actors_that_ran() const { return actors_that_ran_; }
 
-  std::mutex& get_mutex() { return mutex_; }
-  bool execute_tasks();
-  void add_task(xbt::Task<void()>&& t) { tasks.push_back(std::move(t)); }
-  void wake_all_waiting_actors() const;
+  void handle_ended_actions() const;
   /**
    * Garbage collection
    *