X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..2f2e508cacac36bd81d1242f11ec2d40661dcb71:/src/simix/smx_private.hpp

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index f22840caaf..e9485988df 100644
--- a/src/simix/smx_private.hpp
+++ b/src/simix/smx_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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,13 +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 <boost/intrusive/list.hpp>
-#include <mutex>
-#include <unordered_map>
-#include <vector>
 
 /********************************** Simix Global ******************************/
 
@@ -21,61 +16,21 @@ namespace simgrid {
 namespace simix {
 
 class Global {
-  friend XBT_PUBLIC bool simgrid::s4u::this_actor::is_maestro();
+  kernel::context::ContextFactory* context_factory_ = nullptr;
 
 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<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;
-#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
-   * 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 dead_actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
-#endif
-  smx_actor_t maestro_process   = nullptr;
-
-  // Maps function names to actor code:
-  std::unordered_map<std::string, simgrid::simix::ActorCodeFactory> registered_functions;
-
-  // This might be used when no corresponding function name is registered:
-  simgrid::simix::ActorCodeFactory default_function;
-
-  std::mutex mutex;
-
-  std::vector<simgrid::xbt::Task<void()>> tasks;
-  std::vector<simgrid::xbt::Task<void()>> tasksTemp;
-
-  std::vector<simgrid::kernel::actor::ActorImpl*> daemons;
+  kernel::context::ContextFactory* get_context_factory() const { return context_factory_; }
+  void set_context_factory(kernel::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;
+  }
 };
 }
 }
 
 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