ctx: move some bits to a private header and reduce the exposure of src/internal_config.h

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

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index b16f819..6543800 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. 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. */
@@ -7,7 +7,6 @@
 #define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
 
 #include "simgrid/forward.h"
-#include "src/internal_config.h"
 #include "src/kernel/activity/ActivityImpl.hpp"
 
 #include <csignal>
@@ -20,11 +19,8 @@ namespace kernel {
 namespace context {
 
 class XBT_PUBLIC ContextFactory {
-private:
-  std::string name_;
-
 public:
-  explicit ContextFactory(std::string name) : name_(std::move(name)) {}
+  explicit ContextFactory() {}
   virtual ~ContextFactory();
   virtual Context* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
 
@@ -34,7 +30,6 @@ public:
   virtual Context* create_maestro(std::function<void()> code, smx_actor_t process);
 
   virtual void run_all() = 0;
-  std::string const& name() const { return name_; }
 
 protected:
   template <class T, class... Args> T* new_context(Args&&... args)
@@ -57,14 +52,14 @@ private:
 public:
   bool iwannadie = false;
 
-  Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+  Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t 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 process() { return this->actor_; }
+  smx_actor_t get_actor() { return this->actor_; }
   void set_cleanup(void_pfn_smxprocess_t cleanup) { cleanup_func_ = cleanup; }
 
   // Scheduling methods
@@ -85,10 +80,11 @@ public:
      */
   public:
     StopRequest() = default;
-    explicit StopRequest(std::string msg) : msg_(msg) {}
+    explicit StopRequest(std::string msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {}
+    const char* what() const noexcept { return msg_.c_str(); }
 
   private:
-    std::string msg_;
+    std::string msg_ = std::string("Actor killed.");
   };
 };
 
@@ -133,16 +129,6 @@ XBT_PUBLIC smx_context_t SIMIX_context_new(std::function<void()> code, void_pfn_
 XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ];
 #endif
 
-/* We are using the bottom of the stack to save some information, like the
- * valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
- * size for the stack. Round its value to a multiple of 16 (asan wants the stacks to be aligned this way). */
-#if HAVE_VALGRIND_H
-#define smx_context_usable_stack_size                                                                                  \
-  ((smx_context_stack_size - sizeof(unsigned int)) & ~0xf) /* for valgrind_stack_id */
-#else
-#define smx_context_usable_stack_size (smx_context_stack_size & ~0xf)
-#endif
-
 /** @brief Executes all the processes to run (in parallel if possible). */
 XBT_PRIVATE void SIMIX_context_runall();