More cleanup in contexts' stop().

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

diff --git a/src/kernel/context/ContextThread.hpp b/src/kernel/context/ContextThread.hpp
index 8cc8753..3449f88 100644 (file)
--- a/src/kernel/context/ContextThread.hpp
+++ b/src/kernel/context/ContextThread.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
+/* Copyright (c) 2009-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@ public:
   friend ThreadContextFactory;
   ThreadContext(std::function<void()> code,
           void_pfn_smxprocess_t cleanup_func,
-          smx_process_t process, bool maestro =false);
+          smx_actor_t process, bool maestro =false);
   ~ThreadContext() override;
   void stop() override;
   void suspend() override;
@@ -37,7 +37,7 @@ private:
   xbt_os_sem_t begin_ = nullptr;
   /** Semaphore used to schedule/unschedule */
   xbt_os_sem_t end_ = nullptr;
-private:
+
   static void* wrapper(void *param);
   static void* maestro_wrapper(void *param);
 public:
@@ -49,13 +49,13 @@ public:
   ThreadContextFactory();
   ~ThreadContextFactory() override;
   ThreadContext* create_context(std::function<void()> code,
-    void_pfn_smxprocess_t cleanup_func,  smx_process_t process) override;
+    void_pfn_smxprocess_t cleanup_func,  smx_actor_t process) override;
   void run_all() override;
   ThreadContext* self() override;
 
   // Optional methods:
-  ThreadContext* attach(void_pfn_smxprocess_t cleanup_func, smx_process_t process) override;
-  ThreadContext* create_maestro(std::function<void()> code, smx_process_t process) override;
+  ThreadContext* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process) override;
+  ThreadContext* create_maestro(std::function<void()> code, smx_actor_t process) override;
 };
 
 }}} // namespace