Not sure of why it helps now

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

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 1a9dae5..ca6e447 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. 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. */
@@ -12,6 +12,7 @@
  * @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,
@@ -76,10 +77,11 @@ void Context::stop()
 {
   if (this->cleanup_func_)
     this->cleanup_func_(this->process_);
-  this->process_->suspended = 0;
+  this->process_->suspended_ = 0;
 
   this->iwannadie = false;
-  simcall_process_cleanup(this->process_);
+  if (not this->process_->finished_) // It seems that we sometimes try to destroy an actor twice
+    simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->process_); });
   this->iwannadie = true;
 }