-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */
/* 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/simix.hpp"
#include "src/kernel/context/Context.hpp"
+#include "src/xbt/OsSemaphore.hpp"
#include "xbt/xbt_os_thread.h"
+#include <thread>
+
namespace simgrid {
namespace kernel {
namespace context {
-class ThreadContext : public AttachContext {
+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() override;
private:
/** A portable thread */
- xbt_os_thread_t thread_ = nullptr;
- /** Semaphore used to schedule/yield the process */
- xbt_os_sem_t begin_ = nullptr;
- /** Semaphore used to schedule/unschedule */
- xbt_os_sem_t end_ = nullptr;
+ std::thread* thread_ = nullptr;
+ /** Semaphore used to schedule/yield the process (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};
bool is_maestro_;
void start(); // match a call to release()
static void* wrapper(void *param);
};
-class SerialThreadContext : public ThreadContext {
+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)
static void run_all();
private:
- static xbt_os_sem_t thread_sem_;
+ static xbt::OsSemaphore* thread_sem_;
void start_hook() override;
void yield_hook() override;
return create_context(std::move(code), cleanup_func, process, maestro);
}
void run_all() override;
- ThreadContext* self() override { return static_cast<ThreadContext*>(xbt_os_thread_get_extra_data()); }
// Optional methods:
ThreadContext* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process) override