X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e816186fdeaf53fa5abf6886f157c499e09c4622..3baaf982217fbc818965e8ed71c3ec91e96844d5:/src/kernel/context/ContextThread.hpp

diff --git a/src/kernel/context/ContextThread.hpp b/src/kernel/context/ContextThread.hpp
index 0dfc83b44f..623aec4733 100644
--- a/src/kernel/context/ContextThread.hpp
+++ b/src/kernel/context/ContextThread.hpp
@@ -11,7 +11,6 @@
 #include "simgrid/simix.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/xbt/OsSemaphore.hpp"
-#include "xbt/xbt_os_thread.h"
 
 #include <thread>
 
@@ -21,7 +20,7 @@ namespace context {
 
 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, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, bool maestro);
   ~ThreadContext() override;
   void stop() override;
   void suspend() override;
@@ -35,7 +34,7 @@ public:
 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};
@@ -51,8 +50,8 @@ private:
 
 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, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, bool maestro)
+      : ThreadContext(std::move(code), cleanup_func, actor, maestro)
   {
   }
 
@@ -61,9 +60,8 @@ public:
 
 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, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, bool maestro)
+      : ThreadContext(std::move(code), cleanup_func, actor, maestro)
   {
   }
 
@@ -83,27 +81,27 @@ public:
   ThreadContextFactory();
   ~ThreadContextFactory() override;
   ThreadContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
-                                smx_actor_t process) override
+                                smx_actor_t actor) override
   {
     bool maestro = not code;
-    return create_context(std::move(code), cleanup_func, process, maestro);
+    return create_context(std::move(code), cleanup_func, actor, maestro);
   }
   void run_all() override;
 
   // Optional methods:
-  ThreadContext* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process) override
+  ThreadContext* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t actor) override
   {
-    return create_context(std::function<void()>(), cleanup_func, process, false);
+    return create_context(std::function<void()>(), cleanup_func, actor, false);
   }
-  ThreadContext* create_maestro(std::function<void()> code, smx_actor_t process) override
+  ThreadContext* create_maestro(std::function<void()> code, smx_actor_t actor) override
   {
-    return create_context(std::move(code), nullptr, process, true);
+    return create_context(std::move(code), nullptr, actor, true);
   }
 
 private:
   bool parallel_;
 
-  ThreadContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+  ThreadContext* create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor,
                                 bool maestro);
 };
 }}} // namespace