X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/kernel/context/Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index e9bea4bc42..c8aba566f3 100644
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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. */
@@ -6,15 +6,17 @@
 #ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
 #define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
 
-#include "simgrid/forward.h"
+#include <simgrid/forward.h>
+#include <xbt/parmap.h>
+
 #include "src/kernel/activity/ActivityImpl.hpp"
 
 #include <csignal>
 #include <functional>
 
-namespace simgrid {
-namespace kernel {
-namespace context {
+namespace simgrid::kernel::context {
+extern unsigned stack_size;
+extern unsigned guard_size;
 
 class XBT_PUBLIC ContextFactory {
 public:
@@ -29,7 +31,10 @@ public:
   /** Turn the current thread into maestro (the old maestro becomes a regular actor) */
   virtual Context* create_maestro(std::function<void()>&& code, actor::ActorImpl* actor);
 
-  virtual void run_all() = 0;
+  virtual void run_all(std::vector<actor::ActorImpl*> const& actors_list) = 0;
+
+  /* This allows Java to hijack the context factory (Java induces factories of factory :) */
+  static std::function<ContextFactory*(void)> initializer;
 
 protected:
   template <class T, class... Args> T* new_context(Args&&... args)
@@ -47,7 +52,7 @@ class XBT_PUBLIC Context {
 
   std::function<void()> code_;
   actor::ActorImpl* actor_ = nullptr;
-  bool iwannadie_          = false;
+  bool is_maestro_;
   void declare_context(std::size_t size);
 
 public:
@@ -55,13 +60,12 @@ public:
   static int install_sigsegv_stack(stack_t* old_stack, bool enable);
 #endif
 
-  Context(std::function<void()>&& code, actor::ActorImpl* actor);
+  Context(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro);
   Context(const Context&) = delete;
   Context& operator=(const Context&) = delete;
   virtual ~Context();
 
-  bool wannadie() const { return iwannadie_; }
-  void set_wannadie(bool value = true) { iwannadie_ = value; }
+  bool is_maestro() const { return is_maestro_; }
   void operator()() const { code_(); }
   bool has_code() const { return static_cast<bool>(code_); }
   actor::ActorImpl* get_actor() const { return this->actor_; }
@@ -79,34 +83,31 @@ public:
 
 class XBT_PUBLIC AttachContext : public Context {
 public:
-  AttachContext(std::function<void()>&& code, actor::ActorImpl* actor) : Context(std::move(code), actor) {}
+  AttachContext(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro)
+      : Context(std::move(code), actor, maestro)
+  {
+  }
   AttachContext(const AttachContext&) = delete;
   AttachContext& operator=(const AttachContext&) = delete;
   ~AttachContext() override;
 
-  /** Called by the context when it is ready to give control
-   *  to the maestro.
-   */
+  /** Called by the context when it is ready to give control to the maestro */
   virtual void attach_start() = 0;
 
   /** Called by the context when it has finished its job */
   virtual void attach_stop() = 0;
 };
 
-
-/* This allows Java to hijack the context factory (Java induces factories of factory :) */
-typedef ContextFactory* (*ContextFactoryInitializer)();
-XBT_PUBLIC_DATA ContextFactoryInitializer factory_initializer;
-
 XBT_PRIVATE ContextFactory* thread_factory();
 XBT_PRIVATE ContextFactory* sysv_factory();
 XBT_PRIVATE ContextFactory* raw_factory();
 XBT_PRIVATE ContextFactory* boost_factory();
 
-} // namespace context
-} // namespace kernel
-} // namespace simgrid
+XBT_PUBLIC bool is_parallel();
+XBT_PUBLIC int get_nthreads();
+XBT_PUBLIC void set_nthreads(int nb_threads);
+XBT_PUBLIC void set_parallel_mode(e_xbt_parmap_mode_t mode);
+XBT_PUBLIC e_xbt_parmap_mode_t get_parallel_mode();
+} // namespace simgrid::kernel::context
 
-XBT_PRIVATE void SIMIX_context_mod_init();
-XBT_PRIVATE void SIMIX_context_mod_exit();
 #endif