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

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index 830a2f819d..26893347ab 100644
--- a/src/simix/smx_private.hpp
+++ b/src/simix/smx_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
@@ -7,9 +7,8 @@
 #define SIMIX_PRIVATE_HPP
 
 #include "simgrid/s4u/Actor.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include <xbt/xbt_os_thread.h>
 
 #include <boost/intrusive/list.hpp>
 #include <mutex>
@@ -25,16 +24,25 @@ class Global {
   friend XBT_PUBLIC bool simgrid::s4u::this_actor::is_maestro();
 
 public:
+  bool execute_tasks();
+  /**
+   * Garbage collection
+   *
+   * Should be called some time to time to free the memory allocated for actors that have finished (or killed).
+   */
+  void empty_trash();
+  void run_all_actors();
+
   smx_context_factory_t context_factory = nullptr;
-  std::vector<smx_actor_t> process_to_run;
-  std::vector<smx_actor_t> process_that_ran;
+  std::vector<smx_actor_t> actors_to_run;
+  std::vector<smx_actor_t> actors_that_ran;
   std::map<aid_t, smx_actor_t> process_list;
   boost::intrusive::list<kernel::actor::ActorImpl,
                          boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
                                                        &kernel::actor::ActorImpl::smx_destroy_list_hook>>
-      process_to_destroy;
+      actors_to_destroy;
 #if SIMGRID_HAVE_MC
-  /* MCer cannot read members process_list and process_to_destroy above in the remote process, so we copy the info it
+  /* MCer cannot read members process_list and actors_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
@@ -67,16 +75,4 @@ XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
 
 XBT_PUBLIC void SIMIX_clean();
 
-/******************************** Exceptions *********************************/
-/** @brief Ask to the provided ActorImpl to raise the provided exception */
-#define SMX_EXCEPTION(issuer, cat, val, msg)                                                                           \
-  if (1) {                                                                                                             \
-    simgrid::kernel::actor::ActorImpl* _smx_throw_issuer = (issuer); /* evaluate only once */                          \
-    xbt_ex e(XBT_THROW_POINT, msg);                                                                                    \
-    e.category                   = cat;                                                                                \
-    e.value                      = val;                                                                                \
-    _smx_throw_issuer->exception = std::make_exception_ptr(e);                                                         \
-  } else                                                                                                               \
-    ((void)0)
-
 #endif