X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38e2adf74c9fccec6487e953bcb6895b72786dc1..4e7df12e1e81b2ff9212175628873d6d880b6630:/src/simix/smx_private.hpp

diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp
index 591265e2bb..18b0131af8 100644
--- a/src/simix/smx_private.hpp
+++ b/src/simix/smx_private.hpp
@@ -1,83 +1,76 @@
-/* Copyright (c) 2007-2010, 2012-2015. 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. */
 
-#ifndef SIMGRID_SIMIX_PRIVATE_HPP
-#define SIMGRID_SIMIX_PRIVATE_HPP
-
-#include <simgrid/simix.hpp>
-#include "smx_private.h"
-#include "src/simix/popping_private.h"
-
-/**
- * \brief destroy a context
- * \param context the context to destroy
- * Argument must be stopped first -- runs in maestro context
- */
-static inline void SIMIX_context_free(smx_context_t context)
-{
-  delete context;
-}
-
-/**
- * \brief stops the execution of a context
- * \param context to stop
- */
-static inline void SIMIX_context_stop(smx_context_t context)
-{
-  context->stop();
-}
+#ifndef SIMIX_PRIVATE_HPP
+#define SIMIX_PRIVATE_HPP
 
-/**
- \brief suspends a context and return the control back to the one which
-        scheduled it
- \param context the context to be suspended (it must be the running one)
- */
-static inline void SIMIX_context_suspend(smx_context_t context)
-{
-  context->suspend();
-}
+#include "simgrid/s4u/Actor.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/context/Context.hpp"
 
-/**
- \brief Executes all the processes to run (in parallel if possible).
- */
-static inline void SIMIX_context_runall(void)
-{
-  if (!xbt_dynar_is_empty(simix_global->process_to_run))
-    simix_global->context_factory->run_all();
-}
+#include <boost/intrusive/list.hpp>
+#include <mutex>
+#include <unordered_map>
+#include <vector>
 
-/**
- \brief returns the current running context
- */
-static inline smx_context_t SIMIX_context_self(void)
-{
-  if (simix_global && simix_global->context_factory)
-    return simix_global->context_factory->self();
-  else
-    return nullptr;
-}
+/********************************** Simix Global ******************************/
 
 namespace simgrid {
 namespace simix {
 
-XBT_PRIVATE ContextFactory* thread_factory();
-XBT_PRIVATE ContextFactory* sysv_factory();
-XBT_PRIVATE ContextFactory* raw_factory();
-XBT_PRIVATE ContextFactory* boost_factory();
-
-template<class R, class... Args> inline
-R simcall(e_smx_simcall_t call, Args&&... args)
-{
-  smx_process_t self = SIMIX_process_self();
-  marshal(&self->simcall, call, std::forward<Args>(args)...);
-  simcall_call(self);
-  return unmarshal<R>(self->simcall.result);
-}
+class Global {
+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> 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>>
+      actors_to_destroy;
+#if SIMGRID_HAVE_MC
+  /* 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
+   *   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;
+};
 }
 }
 
+XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
+
+XBT_PUBLIC void SIMIX_clean();
+
 #endif