class XBT_PUBLIC ThreadContext : public AttachContext {
public:
- ThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, bool maestro);
+ ThreadContext(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro);
+ ThreadContext(const ThreadContext&) = delete;
+ ThreadContext& operator=(const ThreadContext&) = delete;
~ThreadContext() override;
void stop() override;
void suspend() override;
private:
/** A portable thread */
std::thread* thread_ = nullptr;
- /** Semaphore used to schedule/yield the process (not needed when the maestro is in main, but harmless then) */
+ /** Semaphore used to schedule/yield the actor (not needed when the maestro is in main, but harmless then) */
xbt::OsSemaphore begin_{0};
/** Semaphore used to schedule/unschedule (not needed when the maestro is in main, but harmless then) */
xbt::OsSemaphore end_{0};
void yield(); // match a call to yield()
virtual void start_hook() { /* empty placeholder, called after start(). Used in parallel mode and Java */}
virtual void yield_hook() { /* empty placeholder, called before yield(). Used in parallel mode */}
+ virtual void stop_hook() { /* empty placeholder, called at stop(). Used in Java */}
- static void* wrapper(void *param);
+ static void wrapper(ThreadContext* context);
};
class XBT_PUBLIC SerialThreadContext : public ThreadContext {
public:
- SerialThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, bool maestro)
- : ThreadContext(std::move(code), cleanup_func, process, maestro)
+ SerialThreadContext(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro)
+ : ThreadContext(std::move(code), actor, maestro)
{
}
class ParallelThreadContext : public ThreadContext {
public:
- ParallelThreadContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
- bool maestro)
- : ThreadContext(std::move(code), cleanup_func, process, maestro)
+ ParallelThreadContext(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro)
+ : ThreadContext(std::move(code), actor, maestro)
{
}
class ThreadContextFactory : public ContextFactory {
public:
ThreadContextFactory();
+ ThreadContextFactory(const ThreadContextFactory&) = delete;
+ ThreadContextFactory& operator=(const ThreadContextFactory&) = delete;
~ThreadContextFactory() override;
- ThreadContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
- smx_actor_t process) override
+ ThreadContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override
{
bool maestro = not code;
- return create_context(std::move(code), cleanup_func, process, 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 process) override
+ ThreadContext* attach(actor::ActorImpl* actor) override
{
- return create_context(std::function<void()>(), cleanup_func, process, false);
+ return create_context(std::function<void()>(), actor, false);
}
- ThreadContext* create_maestro(std::function<void()> code, smx_actor_t process) override
+ ThreadContext* create_maestro(std::function<void()>&& code, actor::ActorImpl* actor) override
{
- return create_context(std::move(code), nullptr, process, true);
+ return create_context(std::move(code), actor, true);
}
private:
bool parallel_;
- ThreadContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
- bool maestro);
+ ThreadContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor, bool maestro);
};
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
#endif