Remove redundant guard.

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

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index c6728df..7f050a0 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -9,17 +9,17 @@
 #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_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;
@@ -104,11 +104,8 @@ void Context::set_current(Context* self)
 
 void Context::declare_context(std::size_t size)
 {
-#if SIMGRID_HAVE_MC
   /* Store the address of the stack in heap to compare it apart of heap comparison */
-  if(MC_is_active())
-    MC_ignore_heap(this, size);
-#endif
+  MC_ignore_heap(this, size);
 }
 
 Context* ContextFactory::attach(actor::ActorImpl*)
@@ -140,10 +137,9 @@ Context::~Context()
 void Context::stop()
 {
   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