unify how threaded and parallelisable context factories find context_self

[simgrid.git] / src / kernel / context / ContextThread.hpp

diff --git a/src/kernel/context/ContextThread.hpp b/src/kernel/context/ContextThread.hpp
index 36104b3..1f9d06e 100644 (file)
--- a/src/kernel/context/ContextThread.hpp
+++ b/src/kernel/context/ContextThread.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2018. 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. */
@@ -9,14 +8,16 @@
 #ifndef SIMGRID_SIMIX_THREAD_CONTEXT_HPP
 #define SIMGRID_SIMIX_THREAD_CONTEXT_HPP
 
-#include <simgrid/simix.hpp>
-
+#include "simgrid/simix.hpp"
+#include "src/kernel/context/Context.hpp"
+#include "src/xbt/OsSemaphore.hpp"
+#include "xbt/xbt_os_thread.h"
 
 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;
@@ -25,28 +26,28 @@ public:
   void attach_start() override;
   void attach_stop() override;
 
-  bool isMaestro() const { return is_maestro_; }
+  bool is_maestro() const { return is_maestro_; }
   void release(); // unblock context's start()
   void wait();    // wait for context's yield()
 
 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;
+  /** 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()
   void yield();                // match a call to yield()
-  virtual void start_hook() { /* empty placeholder, called after start() */}
-  virtual void yield_hook() { /* empty placeholder, called before 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 */}
 
   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)
@@ -69,7 +70,7 @@ public:
   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;
@@ -86,7 +87,6 @@ public:
     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