cleanups around the actor terminaison

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

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index a5de192..cdce4e0 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -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. */
@@ -34,9 +34,14 @@ ContextFactoryInitializer factory_initializer = nullptr;
 
 ContextFactory::~ContextFactory() = default;
 
-Context* ContextFactory::self()
+static thread_local smx_context_t smx_current_context = nullptr;
+Context* Context::self()
 {
-  return SIMIX_context_get_current();
+  return smx_current_context;
+}
+void Context::set_current(Context* self)
+{
+  smx_current_context = self;
 }
 
 void Context::declare_context(std::size_t size)
@@ -61,18 +66,19 @@ Context* ContextFactory::create_maestro(std::function<void()> code, smx_actor_t
 }
 
 Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
-    : code_(std::move(code)), actor_(actor)
+    : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
 {
-  /* If the user provided a function for the process then use it.
-     Otherwise, it is the context for maestro and we should set it as the
-     current context */
-  if (has_code())
-    this->cleanup_func_ = cleanup_func;
-  else
-    SIMIX_context_set_current(this);
+  /* If no function was provided, this is the context for maestro
+   * and we should set it as the current context */
+  if (not has_code())
+    set_current(this);
 }
 
-Context::~Context() = default;
+Context::~Context()
+{
+  if (self() == this)
+    set_current(nullptr);
+}
 
 void Context::stop()
 {
@@ -94,13 +100,3 @@ void SIMIX_context_runall()
 {
   simix_global->context_factory->run_all();
 }
-
-/** @brief returns the current running context */
-smx_context_t SIMIX_context_self()
-{
-  if (simix_global && simix_global->context_factory)
-    return simix_global->context_factory->self();
-  else
-    return nullptr;
-}
-