X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/207e186001374b77093f4064a2a25a9c626a989d..8447c8d8e06bb152cf265e23331f9cab0f5cce9e:/src/kernel/context/Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 0aead0c913..359ddf6357 100644
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -1,12 +1,14 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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 "mc/mc.h"
 
+#include "simgrid/s4u/Host.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_private.hpp"
+#include "src/surf/surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
@@ -21,7 +23,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);
 }
@@ -29,16 +30,20 @@ smx_context_t SIMIX_context_new(
 namespace simgrid {
 namespace kernel {
 namespace context {
-static thread_local smx_context_t smx_current_context;
 
 ContextFactoryInitializer factory_initializer = nullptr;
 
 ContextFactory::~ContextFactory() = default;
 
-Context* ContextFactory::self()
+static thread_local smx_context_t smx_current_context = nullptr;
+Context* Context::self()
 {
   return smx_current_context;
 }
+void Context::set_current(Context* self)
+{
+  smx_current_context = self;
+}
 
 void Context::declare_context(std::size_t size)
 {
@@ -62,54 +67,61 @@ 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
-    SIMIX_context_set_current(this);
+  /* 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);
 }
 
-Context::~Context() = default;
+Context::~Context()
+{
+  if (self() == this)
+    set_current(nullptr);
+}
 
 void Context::stop()
 {
+  actor_->finished_ = true;
+
+  if (actor_->auto_restart_ && actor_->host_->is_off()) {
+    XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", actor_->host_->get_cname(),
+              actor_->get_cname());
+    watched_hosts.insert(actor_->host_->get_cname());
+  }
+
   if (this->cleanup_func_)
     this->cleanup_func_(this->actor_);
-  this->actor_->suspended_ = 0;
 
-  this->iwannadie = false;
+  this->iwannadie = false; // don't let the yield call ourself -- Context::stop()
   simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });
   this->iwannadie = true;
 }
 
 AttachContext::~AttachContext() = default;
 
-}}}
-
-/** @brief Executes all the processes to run (in parallel if possible). */
-void SIMIX_context_runall()
+void throw_stoprequest()
 {
-  simix_global->context_factory->run_all();
+  throw Context::StopRequest();
 }
 
-/** @brief returns the current running context */
-smx_context_t SIMIX_context_self()
+bool try_n_catch_stoprequest(std::function<void(void)> try_block)
 {
-  if (simix_global && simix_global->context_factory)
-    return simix_global->context_factory->self();
-  else
-    return nullptr;
+  bool res;
+  try {
+    try_block();
+    res = true;
+  } catch (Context::StopRequest const&) {
+    XBT_DEBUG("Caught a StopRequest");
+    res = false;
+  }
+  return res;
 }
+}}}
 
-/**
- * @brief Sets the current context of this thread.
- * @param context the context to set
- */
-void SIMIX_context_set_current(smx_context_t context)
+/** @brief Executes all the processes to run (in parallel if possible). */
+void SIMIX_context_runall()
 {
-  simgrid::kernel::context::smx_current_context = context;
+  simix_global->context_factory->run_all();
 }