X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..5ec2b80b686983f84ebab7c7398a29e73286deee:/src/kernel/context/Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 66a895bf79..bc336be451 100644
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
@@ -9,6 +9,7 @@
 #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>
@@ -79,7 +80,6 @@ ContextFactory::~ContextFactory() = default;
 
 thread_local Context* Context::current_context_ = nullptr;
 
-#ifndef WIN32
 /* Install or disable alternate signal stack, for SIGSEGV handler. */
 int Context::install_sigsegv_stack(stack_t* old_stack, bool enable)
 {
@@ -90,7 +90,6 @@ int Context::install_sigsegv_stack(stack_t* old_stack, bool enable)
   stack.ss_flags = enable ? 0 : SS_DISABLE;
   return sigaltstack(&stack, old_stack);
 }
-#endif
 
 Context* Context::self()
 {
@@ -103,11 +102,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*)
@@ -139,6 +135,7 @@ Context::~Context()
 void Context::stop()
 {
   this->actor_->cleanup_from_self();
+  sthread_disable();
   throw ForcefulKillException(); // clean RAII variables with the dedicated exception
 }
 AttachContext::~AttachContext() = default;