step by step cleanup. This code drives me nuts

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

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index c04ae5b..9415e8d 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -21,7 +21,6 @@ smx_context_t SIMIX_context_new(
   void_pfn_smxprocess_t cleanup_func,
   smx_actor_t simix_process)
 {
-  xbt_assert(simix_global, "simix is not initialized, please call MSG_init first");
   return simix_global->context_factory->create_context(
     std::move(code), cleanup_func, simix_process);
 }
@@ -66,14 +65,11 @@ Context* ContextFactory::create_maestro(std::function<void()> code, smx_actor_t
 }
 
 Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
-    : code_(std::move(code)), actor_(actor)
+    : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
 {
-  /* If the user provided a function for the process then use it.
-     Otherwise, it is the context for maestro and we should set it as the
-     current context */
-  if (has_code())
-    this->cleanup_func_ = cleanup_func;
-  else
+  /* If no function was provided, this is the context for maestro
+   * and we should set it as the current context */
+  if (not has_code())
     set_current(this);
 }
 
@@ -87,7 +83,6 @@ void Context::stop()
 {
   if (this->cleanup_func_)
     this->cleanup_func_(this->actor_);
-  this->actor_->suspended_ = 0;
 
   this->iwannadie = false;
   simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });