Update copyright lines.

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

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index b5e5e64..e26bb2e 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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. */
@@ -18,7 +18,7 @@ namespace context {
 
 class XBT_PUBLIC ContextFactory {
 public:
-  explicit ContextFactory() {}
+  explicit ContextFactory()             = default;
   ContextFactory(const ContextFactory&) = delete;
   ContextFactory& operator=(const ContextFactory&) = delete;
   virtual ~ContextFactory();
@@ -34,7 +34,7 @@ public:
 protected:
   template <class T, class... Args> T* new_context(Args&&... args)
   {
-    T* context = new T(std::forward<Args>(args)...);
+    auto* context = new T(std::forward<Args>(args)...);
     context->declare_context(sizeof(T));
     return context;
   }
@@ -43,21 +43,28 @@ protected:
 class XBT_PUBLIC Context {
   friend ContextFactory;
 
+  static thread_local Context* current_context_;
+
   std::function<void()> code_;
   actor::ActorImpl* actor_ = nullptr;
+  bool iwannadie_          = false;
   void declare_context(std::size_t size);
 
 public:
-  bool iwannadie = false;
+#ifndef WIN32
+  static int install_sigsegv_stack(stack_t* old_stack, bool enable);
+#endif
 
   Context(std::function<void()>&& code, actor::ActorImpl* actor);
   Context(const Context&) = delete;
   Context& operator=(const Context&) = delete;
   virtual ~Context();
 
-  void operator()() { code_(); }
+  bool wannadie() const { return iwannadie_; }
+  void set_wannadie(bool value = true) { iwannadie_ = value; }
+  void operator()() const { code_(); }
   bool has_code() const { return static_cast<bool>(code_); }
-  actor::ActorImpl* get_actor() { return this->actor_; }
+  actor::ActorImpl* get_actor() const { return this->actor_; }
 
   // Scheduling methods
   virtual void stop();
@@ -88,7 +95,7 @@ public:
 
 
 /* This allows Java to hijack the context factory (Java induces factories of factory :) */
-typedef ContextFactory* (*ContextFactoryInitializer)();
+using ContextFactoryInitializer = ContextFactory* (*)();
 XBT_PUBLIC_DATA ContextFactoryInitializer factory_initializer;
 
 XBT_PRIVATE ContextFactory* thread_factory();
@@ -100,15 +107,6 @@ XBT_PRIVATE ContextFactory* boost_factory();
 } // namespace kernel
 } // namespace simgrid
 
-typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
-
 XBT_PRIVATE void SIMIX_context_mod_init();
 XBT_PRIVATE void SIMIX_context_mod_exit();
-
-#ifndef WIN32
-XBT_PUBLIC_DATA unsigned char sigsegv_stack[SIGSTKSZ];
-#endif
-
-XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string& name);
-
 #endif