Make sthread_inside_simgrid static into libsthread in the (vain) hope that it'll...

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

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index afacbd3..6827ff9 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -1,31 +1,32 @@
-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. 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. */
 
 #include "mc/mc.h"
 
+#include "simgrid/Exception.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/context/Context.hpp"
+#include "src/sthread/sthread.h"
 #include "src/surf/surf_interface.hpp"
 
 #include <vector>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_context, kernel, "Context switching mechanism");
 
-namespace simgrid {
-namespace kernel {
-namespace context {
+namespace simgrid::kernel::context {
+
+std::function<ContextFactory*(void)> ContextFactory::initializer;
 
-ContextFactoryInitializer factory_initializer = nullptr;
 static e_xbt_parmap_mode_t parallel_synchronization_mode = XBT_PARMAP_DEFAULT;
 static int parallel_contexts                             = 1;
 unsigned stack_size;
 unsigned guard_size;
 
 /** @brief Returns whether some parallel threads are used for the user contexts. */
-int is_parallel()
+bool is_parallel()
 {
   return parallel_contexts > 1;
 }
@@ -122,11 +123,11 @@ Context* ContextFactory::create_maestro(std::function<void()>&&, actor::ActorImp
     "Try using --cfg=contexts/factory:thread instead.\n");
 }
 
-Context::Context(std::function<void()>&& code, actor::ActorImpl* actor) : code_(std::move(code)), actor_(actor)
+Context::Context(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro)
+    : code_(std::move(code)), actor_(actor), is_maestro_(maestro)
 {
-  /* If no function was provided, this is the context for maestro
-   * and we should set it as the current context */
-  if (not has_code())
+  /* If we are creating maestro, we should set it as the current context */
+  if (maestro)
     set_current(this);
 }
 
@@ -138,11 +139,10 @@ Context::~Context()
 
 void Context::stop()
 {
-  this->actor_->cleanup();
+  this->actor_->cleanup_from_self();
+  sthread_disable();
+  throw ForcefulKillException(); // clean RAII variables with the dedicated exception
 }
-
 AttachContext::~AttachContext() = default;
 
-} // namespace context
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::context