mv ActorImpl where it belongs

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

diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index ad79b5e..70a87d2 100644 (file)
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -9,8 +9,8 @@
 
 #include "mc/mc.h"
 #include "simgrid/Exception.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 #include "src/mc/mc_ignore.hpp"
-#include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.hpp"
 
 #include "ContextUnix.hpp"
@@ -41,8 +41,8 @@ static void smx_ctx_wrapper(int i1, int i2)
   try {
     (*context)();
     context->Context::stop();
-  } catch (simgrid::kernel::context::StopRequest const&) {
-    XBT_DEBUG("Caught a StopRequest");
+  } catch (simgrid::ForcefulKillException const&) {
+    XBT_DEBUG("Caught a ForcefulKillException");
   } catch (simgrid::Exception const& e) {
     XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
     throw;
@@ -56,7 +56,7 @@ namespace kernel {
 namespace context {
 
 // UContextFactory
-Context* UContextFactory::create_context(std::function<void()> code, smx_actor_t actor)
+Context* UContextFactory::create_context(std::function<void()>&& code, smx_actor_t actor)
 {
   return new_context<UContext>(std::move(code), actor, this);
 }
@@ -64,7 +64,7 @@ Context* UContextFactory::create_context(std::function<void()> code, smx_actor_t
 
 // UContext
 
-UContext::UContext(std::function<void()> code, smx_actor_t actor, SwappedContextFactory* factory)
+UContext::UContext(std::function<void()>&& code, smx_actor_t actor, SwappedContextFactory* factory)
     : SwappedContext(std::move(code), actor, factory)
 {
   /* if the user provided a function for the actor then use it. If not, nothing to do for maestro. */