X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/60ce0b9f4a108a6a7b1d6c883511e21645a853c1..038fd3c4a495508204a7b9c2e9745426a0bfadf1:/src/kernel/context/Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index 1cf7104473..c02dd39ea4 100644
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -12,9 +12,6 @@
 #include <csignal>
 #include <functional>
 
-/* Process creation/destruction callbacks */
-typedef void (*void_pfn_smxprocess_t)(smx_actor_t);
-
 namespace simgrid {
 namespace kernel {
 namespace context {
@@ -22,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, void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
+  virtual Context* create_context(std::function<void()> code, smx_actor_t actor) = 0;
 
   /** Turn the current thread into a simulation context */
-  virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  virtual Context* attach(smx_actor_t 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 process);
+  virtual Context* create_maestro(std::function<void()> code, smx_actor_t actor);
 
   virtual void run_all() = 0;
 
@@ -44,16 +43,14 @@ protected:
 class XBT_PUBLIC Context {
   friend ContextFactory;
 
-private:
   std::function<void()> code_;
-  void_pfn_smxprocess_t cleanup_func_ = nullptr;
   smx_actor_t actor_                  = nullptr;
   void declare_context(std::size_t size);
 
 public:
   bool iwannadie = false;
 
-  Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor);
+  Context(std::function<void()> code, smx_actor_t actor);
   Context(const Context&) = delete;
   Context& operator=(const Context&) = delete;
   virtual ~Context();
@@ -61,7 +58,6 @@ public:
   void operator()() { code_(); }
   bool has_code() const { return static_cast<bool>(code_); }
   smx_actor_t get_actor() { return this->actor_; }
-  void set_cleanup(void_pfn_smxprocess_t cleanup) { cleanup_func_ = cleanup; }
 
   // Scheduling methods
   virtual void stop();
@@ -76,11 +72,9 @@ public:
 
 class XBT_PUBLIC AttachContext : public Context {
 public:
-  AttachContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
-      : Context(std::move(code), cleanup_func, actor)
-  {
-  }
-
+  AttachContext(std::function<void()> code, smx_actor_t 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
@@ -92,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(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)();
@@ -127,11 +103,8 @@ typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
 XBT_PRIVATE void SIMIX_context_mod_init();
 XBT_PRIVATE void SIMIX_context_mod_exit();
 
-XBT_PUBLIC smx_context_t SIMIX_context_new(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
-                                           smx_actor_t simix_process);
-
 #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). */
@@ -139,8 +112,6 @@ XBT_PRIVATE void SIMIX_context_runall();
 
 XBT_PUBLIC int SIMIX_process_get_maxpid();
 
-XBT_PRIVATE void SIMIX_post_create_environment();
-
-XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(std::string name);
+XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string& name);
 
 #endif