X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d2bffb7542628af525b2507d2a5035ead215ff2..72b7977026be2ec4497220e10118d392a76b310b:/src/kernel/context/ContextThread.hpp diff --git a/src/kernel/context/ContextThread.hpp b/src/kernel/context/ContextThread.hpp index 22e381484c..720e54b229 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, smx_actor_t actor, bool maestro); + ThreadContext(std::function&& code, actor::ActorImpl* actor, bool maestro); ThreadContext(const ThreadContext&) = delete; ThreadContext& operator=(const ThreadContext&) = delete; ~ThreadContext() override; @@ -53,7 +53,7 @@ private: class XBT_PUBLIC SerialThreadContext : public ThreadContext { public: - SerialThreadContext(std::function code, smx_actor_t actor, bool maestro) + SerialThreadContext(std::function&& code, actor::ActorImpl* actor, bool maestro) : ThreadContext(std::move(code), actor, maestro) { } @@ -63,7 +63,7 @@ public: class ParallelThreadContext : public ThreadContext { public: - ParallelThreadContext(std::function code, smx_actor_t actor, bool maestro) + ParallelThreadContext(std::function&& code, actor::ActorImpl* actor, bool maestro) : ThreadContext(std::move(code), actor, maestro) { } @@ -85,7 +85,7 @@ public: ThreadContextFactory(const ThreadContextFactory&) = delete; ThreadContextFactory& operator=(const ThreadContextFactory&) = delete; ~ThreadContextFactory() override; - ThreadContext* create_context(std::function code, smx_actor_t actor) override + ThreadContext* create_context(std::function&& code, actor::ActorImpl* actor) override { bool maestro = not code; return create_context(std::move(code), actor, maestro); @@ -93,8 +93,11 @@ public: void run_all() override; // Optional methods: - 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 + ThreadContext* attach(actor::ActorImpl* actor) override + { + return create_context(std::function(), actor, false); + } + ThreadContext* create_maestro(std::function&& code, actor::ActorImpl* actor) override { return create_context(std::move(code), actor, true); } @@ -102,8 +105,10 @@ public: private: bool parallel_; - ThreadContext* create_context(std::function code, smx_actor_t actor, bool maestro); + ThreadContext* create_context(std::function&& code, actor::ActorImpl* actor, bool maestro); }; -}}} // namespace +} // namespace context +} // namespace kernel +} // namespace simgrid #endif