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 06e540232a8953aa5478e679c67ea6990e052a21..fb8aacb0e404f8a15bdf34ef450453c65015fcb8 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -54,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");
@@ -101,6 +101,25 @@ void Context::stop()
 
 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). */