Use references for parameters of type std::function.

[simgrid.git] / src / kernel / context / Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index cff4dbe..ae50c28 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -22,12 +22,12 @@ public:
   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, smx_actor_t actor) = 0;
 
   /** Turn the current thread into a simulation context */
   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 actor);
+  virtual Context* create_maestro(std::function<void()>&& code, smx_actor_t actor);
 
   virtual void run_all() = 0;
 
@@ -50,7 +50,7 @@ class XBT_PUBLIC Context {
 public:
   bool iwannadie = false;
 
-  Context(std::function<void()> code, smx_actor_t actor);
+  Context(std::function<void()>&& code, smx_actor_t actor);
   Context(const Context&) = delete;
   Context& operator=(const Context&) = delete;
   virtual ~Context();
@@ -72,7 +72,7 @@ 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, smx_actor_t actor) : Context(std::move(code), actor) {}
   AttachContext(const AttachContext&) = delete;
   AttachContext& operator=(const AttachContext&) = delete;
   ~AttachContext() override;
@@ -86,43 +86,6 @@ public:
   virtual void attach_stop() = 0;
 };
 
-class XBT_PUBLIC ForcefulKillException {
-  /** @brief Exception launched to kill an actor; DO NOT BLOCK IT!
-   *
-   * This exception is thrown whenever the actor's host is turned off. The actor stack is properly unwinded to release
-   * all objects allocated on the stack (RAII powa).
-   *
-   * You may want to catch this exception to perform some extra cleanups in your simulation, but YOUR ACTORS MUST NEVER
-   * SURVIVE a ForcefulKillException, or your simulation will segfault.
-   *
-   * @verbatim
-   * void* payload = malloc(512);
-   *
-   * try {
-   *   simgrid::s4u::this_actor::execute(100000);
-   * } catch (simgrid::kernel::context::ForcefulKillException& e) { // oops, my host just turned off
-   *   free(malloc);
-   *   throw; // I shall never survive on an host that was switched off
-   * }
-   * @endverbatim
-   *
-   * 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:
-  ForcefulKillException() = default;
-  explicit ForcefulKillException(const std::string& msg) : msg_(std::string("Actor killed (") + msg + std::string(")."))
-  {
-  }
-  ~ForcefulKillException();
-  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)();
@@ -141,7 +104,7 @@ 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). */