X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b686073e4e6991ea9ae4154a13bf693acd738551..64916baf9d485ba6a2546bf79c948c591a233465:/src/kernel/context/Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index eab87f8071..1bbcd8b0a7 100644
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -17,7 +17,6 @@
 #include "simgrid/simix.h"
 #include "surf/surf.h"
 #include "xbt/base.h"
-#include "xbt/fifo.h"
 #include "xbt/swag.h"
 #include "xbt/dict.h"
 #include "xbt/mallocator.h"
@@ -41,8 +40,6 @@ namespace simgrid {
 namespace kernel {
 namespace context {
 
-  class Context;
-
   XBT_PUBLIC_CLASS ContextFactory {
   private:
     std::string name_;
@@ -51,7 +48,7 @@ namespace context {
     explicit ContextFactory(std::string name) : name_(std::move(name)) {}
     virtual ~ContextFactory();
     virtual Context* create_context(std::function<void()> code,
-      void_pfn_smxprocess_t cleanup, smx_process_t process) = 0;
+      void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
 
     // Optional methods for attaching main() as a context:
 
@@ -59,8 +56,8 @@ namespace context {
      *
      *  This will not work on all implementation of `ContextFactory`.
      */
-    virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_process_t process);
-    virtual Context* create_maestro(std::function<void()> code, smx_process_t process);
+    virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+    virtual Context* create_maestro(std::function<void()> code, smx_actor_t process);
 
     virtual void run_all() = 0;
     virtual Context* self();
@@ -84,22 +81,22 @@ namespace context {
   private:
     std::function<void()> code_;
     void_pfn_smxprocess_t cleanup_func_ = nullptr;
-    smx_process_t process_ = nullptr;
+    smx_actor_t process_ = nullptr;
   public:
     bool iwannadie;
   public:
     Context(std::function<void()> code,
             void_pfn_smxprocess_t cleanup_func,
-            smx_process_t process);
+            smx_actor_t process);
     void operator()()
     {
       code_();
     }
     bool has_code() const
     {
-      return (bool) code_;
+      return static_cast<bool>(code_);
     }
-    smx_process_t process()
+    smx_actor_t process()
     {
       return this->process_;
     }
@@ -119,7 +116,7 @@ namespace context {
 
     AttachContext(std::function<void()> code,
             void_pfn_smxprocess_t cleanup_func,
-            smx_process_t process)
+            smx_actor_t process)
       : Context(std::move(code), cleanup_func, process)
     {}
 
@@ -135,7 +132,7 @@ namespace context {
   };
 
 /* This allows Java to hijack the context factory (Java induces factories of factory :) */
-typedef ContextFactory* (*ContextFactoryInitializer)(void);
+typedef ContextFactory* (*ContextFactoryInitializer)();
 XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer;
 
 XBT_PRIVATE ContextFactory* thread_factory();
@@ -150,13 +147,13 @@ typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t;
 SG_BEGIN_DECL()
 
 
-XBT_PRIVATE void SIMIX_context_mod_init(void);
-XBT_PRIVATE void SIMIX_context_mod_exit(void);
+XBT_PRIVATE void SIMIX_context_mod_init();
+XBT_PRIVATE void SIMIX_context_mod_exit();
 
 XBT_PRIVATE smx_context_t SIMIX_context_new(
   std::function<void()> code,
   void_pfn_smxprocess_t cleanup_func,
-  smx_process_t simix_process);
+  smx_actor_t simix_process);
 
 #ifndef WIN32
 XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
@@ -173,19 +170,19 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
 #endif
 
 /** @brief Executes all the processes to run (in parallel if possible). */
-XBT_PRIVATE void SIMIX_context_runall(void);
+XBT_PRIVATE void SIMIX_context_runall();
 /** @brief returns the current running context */
-XBT_PUBLIC(smx_context_t) SIMIX_context_self(void); // public because it's used in simgrid-java
+XBT_PUBLIC(smx_context_t) SIMIX_context_self(); // public because it's used in simgrid-java
 
-XBT_PRIVATE void *SIMIX_context_stack_new(void);
+XBT_PRIVATE void *SIMIX_context_stack_new();
 XBT_PRIVATE void SIMIX_context_stack_delete(void *stack);
 
 XBT_PRIVATE void SIMIX_context_set_current(smx_context_t context);
-XBT_PRIVATE smx_context_t SIMIX_context_get_current(void);
+XBT_PRIVATE smx_context_t SIMIX_context_get_current();
 
-XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
+XBT_PUBLIC(int) SIMIX_process_get_maxpid();
 
-XBT_PRIVATE void SIMIX_post_create_environment(void);
+XBT_PRIVATE void SIMIX_post_create_environment();
 
 SG_END_DECL()