Modernize simcall process_cleanup.

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

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 2288faa..73dccc4 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -1,26 +1,18 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2018. 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 <cstdint>
-
-#include <memory>
-#include <functional>
-#include <utility>
-
-#include <simgrid/simix.hpp>
-
 #include "mc/mc.h"
 
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.hpp"
 
 /**
  * @brief creates a new context for a user level process
  * @param code a main function
  * @param cleanup_func the function to call when the context stops
+ * @param simix_process
  */
 smx_context_t SIMIX_context_new(
   std::function<void()> code,
@@ -47,7 +39,7 @@ Context* ContextFactory::self()
 
 void ContextFactory::declare_context(void* context, std::size_t size)
 {
-#if HAVE_MC
+#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(context, size);
@@ -88,7 +80,7 @@ void Context::stop()
   this->process_->suspended = 0;
 
   this->iwannadie = false;
-  simcall_process_cleanup(this->process_);
+  simgrid::simix::kernelImmediate([this] { SIMIX_process_cleanup(this->process_); });
   this->iwannadie = true;
 }