X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0eef92d7d664eabdb1145f511916212504489d84..4d02714ee138a3bd9b02e0064b7a2aa26407e9e8:/src/kernel/context/ContextSwapped.cpp diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index 2e964404dc..9f402179b9 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -3,6 +3,7 @@ /* 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 "simgrid/Exception.hpp" #include "simgrid/modelchecker.h" #include "src/internal_config.h" #include "src/kernel/context/context_private.hpp" @@ -47,9 +48,8 @@ SwappedContextFactory::~SwappedContextFactory() delete parmap_; } -SwappedContext::SwappedContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, - SwappedContextFactory* factory) - : Context(std::move(code), cleanup_func, process), factory_(factory) +SwappedContext::SwappedContext(std::function code, smx_actor_t actor, SwappedContextFactory* factory) + : Context(std::move(code), actor), factory_(factory) { // Save maestro (=context created first) in preparation for run_all if (not factory->parallel_ && factory_->workers_context_[0] == nullptr) @@ -148,7 +148,7 @@ void SwappedContext::stop() { Context::stop(); /* We must cut the actor execution using an exception to properly free the C++ RAII variables */ - throw StopRequest(); + throw ForcefulKillException(); } /** Maestro wants to run all ready actors */