X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2cf13759ba1696d88f5ff86afee5324f30ccdbfc..247fba2eee61dc2a8e06c6f1339437dcb4481c3b:/src/kernel/context/ContextThread.hpp diff --git a/src/kernel/context/ContextThread.hpp b/src/kernel/context/ContextThread.hpp index 09ac695785..6f6125a59b 100644 --- a/src/kernel/context/ContextThread.hpp +++ b/src/kernel/context/ContextThread.hpp @@ -20,7 +20,7 @@ namespace context { class XBT_PUBLIC ThreadContext : public AttachContext { public: - ThreadContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, bool maestro); + ThreadContext(std::function code, smx_actor_t actor, bool maestro); ~ThreadContext() override; void stop() override; void suspend() override; @@ -51,8 +51,8 @@ private: class XBT_PUBLIC SerialThreadContext : public ThreadContext { public: - SerialThreadContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, bool maestro) - : ThreadContext(std::move(code), cleanup_func, actor, maestro) + SerialThreadContext(std::function code, smx_actor_t actor, bool maestro) + : ThreadContext(std::move(code), actor, maestro) { } @@ -61,8 +61,8 @@ public: class ParallelThreadContext : public ThreadContext { public: - ParallelThreadContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, bool maestro) - : ThreadContext(std::move(code), cleanup_func, actor, maestro) + ParallelThreadContext(std::function code, smx_actor_t actor, bool maestro) + : ThreadContext(std::move(code), actor, maestro) { } @@ -81,29 +81,24 @@ class ThreadContextFactory : public ContextFactory { public: ThreadContextFactory(); ~ThreadContextFactory() override; - ThreadContext* create_context(std::function code, void_pfn_smxprocess_t cleanup_func, - smx_actor_t actor) override + ThreadContext* create_context(std::function code, smx_actor_t actor) override { bool maestro = not code; - return create_context(std::move(code), cleanup_func, actor, maestro); + return create_context(std::move(code), actor, maestro); } void run_all() override; // Optional methods: - ThreadContext* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t actor) override - { - return create_context(std::function(), cleanup_func, actor, false); - } + ThreadContext* attach(smx_actor_t actor) override { return create_context(std::function(), actor, false); } ThreadContext* create_maestro(std::function code, smx_actor_t actor) override { - return create_context(std::move(code), nullptr, actor, true); + return create_context(std::move(code), actor, true); } private: bool parallel_; - ThreadContext* create_context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, - bool maestro); + ThreadContext* create_context(std::function code, smx_actor_t actor, bool maestro); }; }}} // namespace