X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af4023f2adc7976a736077c23829d217e7b89637..a153a91671e462f1d1f231dabd6f5f81efd81d76:/src/simix/smx_private.hpp

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index 1a2ba34e78..8bbb7ecad9 100644
--- a/src/simix/smx_private.hpp
+++ b/src/simix/smx_private.hpp
@@ -10,6 +10,7 @@
 #include "src/kernel/context/Context.hpp"
 #include <csignal>
 
+#include <boost/intrusive/list.hpp>
 #include <map>
 #include <vector>
 
@@ -19,24 +20,28 @@ namespace simgrid {
 namespace simix {
 
 class Global {
-  friend bool simgrid::s4u::this_actor::isMaestro();
+  friend XBT_PUBLIC(bool) simgrid::s4u::this_actor::isMaestro();
 
 public:
   smx_context_factory_t context_factory = nullptr;
   std::vector<smx_actor_t> process_to_run;
   std::vector<smx_actor_t> process_that_ran;
   std::map<aid_t, smx_actor_t> process_list;
+  boost::intrusive::list<ActorImpl, boost::intrusive::member_hook<ActorImpl, boost::intrusive::list_member_hook<>,
+                                                                  &ActorImpl::smx_destroy_list_hook>>
+      process_to_destroy;
 #if SIMGRID_HAVE_MC
-  /* MCer cannot read the std::map above in the remote process, so we copy the info it needs in a dynar.
+  /* MCer cannot read members process_list and process_to_destroy 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(smx_actor_t), nullptr);
+  xbt_dynar_t actors_vector      = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
+  xbt_dynar_t dead_actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
 #endif
-  xbt_swag_t process_to_destroy = nullptr;
   smx_actor_t maestro_process   = nullptr;
 
   // Maps function names to actor code: