Move StopRequest out of Context.

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

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 9415e8d09c42c3e4ca85dbae957dc43ea7a1bcc2..fb8aacb0e404f8a15bdf34ef450453c65015fcb8 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -5,8 +5,10 @@
 
 #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);
 
@@ -52,13 +54,13 @@ void Context::declare_context(std::size_t size)
 #endif
 }
 
-Context* ContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
+Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t)
 {
   xbt_die("Cannot attach with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
 }
 
-Context* ContextFactory::create_maestro(std::function<void()> code, smx_actor_t process)
+Context* ContextFactory::create_maestro(std::function<void()>, smx_actor_t)
 {
   xbt_die("Cannot create_maestro with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
@@ -81,16 +83,43 @@ Context::~Context()
 
 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->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;
 
+StopRequest::~StopRequest() = default;
+
+void throw_stoprequest()
+{
+  throw StopRequest();
+}
+
+bool try_n_catch_stoprequest(std::function<void(void)> try_block)
+{
+  bool res;
+  try {
+    try_block();
+    res = true;
+  } catch (StopRequest const&) {
+    XBT_DEBUG("Caught a StopRequest");
+    res = false;
+  }
+  return res;
+}
 }}}
 
 /** @brief Executes all the processes to run (in parallel if possible). */