X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/247fba2eee61dc2a8e06c6f1339437dcb4481c3b..2685dbb427cbe90685e23c1000d8b6670bb91750:/src/kernel/context/Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index 42a1ca4552..b2fadf009a 100644
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -19,13 +19,15 @@ namespace context {
 class XBT_PUBLIC ContextFactory {
 public:
   explicit ContextFactory() {}
+  ContextFactory(const ContextFactory&) = delete;
+  ContextFactory& operator=(const ContextFactory&) = delete;
   virtual ~ContextFactory();
-  virtual Context* create_context(std::function<void()> code, smx_actor_t actor) = 0;
+  virtual Context* create_context(std::function<void()>&& code, actor::ActorImpl* actor) = 0;
 
   /** Turn the current thread into a simulation context */
-  virtual Context* attach(smx_actor_t actor);
+  virtual Context* attach(actor::ActorImpl* actor);
   /** Turn the current thread into maestro (the old maestro becomes a regular actor) */
-  virtual Context* create_maestro(std::function<void()> code, smx_actor_t actor);
+  virtual Context* create_maestro(std::function<void()>&& code, actor::ActorImpl* actor);
 
   virtual void run_all() = 0;
 
@@ -41,22 +43,21 @@ protected:
 class XBT_PUBLIC Context {
   friend ContextFactory;
 
-private:
   std::function<void()> code_;
-  smx_actor_t actor_                  = nullptr;
+  actor::ActorImpl* actor_ = nullptr;
   void declare_context(std::size_t size);
 
 public:
   bool iwannadie = false;
 
-  Context(std::function<void()> code, smx_actor_t actor);
+  Context(std::function<void()>&& code, actor::ActorImpl* actor);
   Context(const Context&) = delete;
   Context& operator=(const Context&) = delete;
   virtual ~Context();
 
   void operator()() { code_(); }
   bool has_code() const { return static_cast<bool>(code_); }
-  smx_actor_t get_actor() { return this->actor_; }
+  actor::ActorImpl* get_actor() { return this->actor_; }
 
   // Scheduling methods
   virtual void stop();
@@ -71,8 +72,9 @@ public:
 
 class XBT_PUBLIC AttachContext : public Context {
 public:
-  AttachContext(std::function<void()> code, smx_actor_t actor) : Context(std::move(code), actor) {}
-
+  AttachContext(std::function<void()>&& code, actor::ActorImpl* actor) : Context(std::move(code), actor) {}
+  AttachContext(const AttachContext&) = delete;
+  AttachContext& operator=(const AttachContext&) = delete;
   ~AttachContext() override;
 
   /** Called by the context when it is ready to give control
@@ -84,24 +86,6 @@ public:
   virtual void attach_stop() = 0;
 };
 
-class XBT_PUBLIC StopRequest {
-  /** @brief Exception launched to kill a process, in order to properly unwind its stack and release RAII stuff
-   *
-   * Nope, Sonar, this should not inherit of std::exception nor of simgrid::Exception.
-   * Otherwise, users may accidentally catch it with a try {} catch (std::exception)
-   */
-public:
-  StopRequest() = default;
-  explicit StopRequest(const std::string& msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {}
-  ~StopRequest();
-  const char* what() const noexcept { return msg_.c_str(); }
-
-  static void do_throw();
-  static bool try_n_catch(std::function<void(void)> try_block);
-
-private:
-  std::string msg_ = std::string("Actor killed.");
-};
 
 /* This allows Java to hijack the context factory (Java induces factories of factory :) */
 typedef ContextFactory* (*ContextFactoryInitializer)();
@@ -112,7 +96,9 @@ XBT_PRIVATE ContextFactory* sysv_factory();
 XBT_PRIVATE ContextFactory* raw_factory();
 XBT_PRIVATE ContextFactory* boost_factory();
 
-}}}
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
 
 typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
 
@@ -120,14 +106,9 @@ XBT_PRIVATE void SIMIX_context_mod_init();
 XBT_PRIVATE void SIMIX_context_mod_exit();
 
 #ifndef WIN32
-XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ];
+XBT_PUBLIC_DATA unsigned char sigsegv_stack[SIGSTKSZ];
 #endif
 
-/** @brief Executes all the processes to run (in parallel if possible). */
-XBT_PRIVATE void SIMIX_context_runall();
-
-XBT_PUBLIC int SIMIX_process_get_maxpid();
-
 XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string& name);
 
 #endif