X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6443d4868c5974225d792156daf319775234b087..2f810149832a2d855c33d0df5b02d736c2081e41:/src/simix/private.h

diff --git a/src/simix/private.h b/src/simix/private.h
index cce6355844..41694a8534 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -31,6 +31,7 @@
 typedef struct s_smx_global {
   smx_context_factory_t context_factory;
   xbt_dynar_t process_to_run;
+  xbt_dynar_t process_that_ran;
   xbt_swag_t process_list;
   xbt_swag_t process_to_destroy;
   smx_process_t maestro_process;
@@ -196,8 +197,10 @@ static XBT_INLINE smx_context_t SIMIX_context_new(xbt_main_func_t code,
                                                   smx_process_t simix_process)
 {
 
-  return (*(simix_global->context_factory->create_context))
-      (code, argc, argv, cleanup_func, simix_process);
+  return simix_global->context_factory->create_context(code,
+                                                       argc, argv,
+                                                       cleanup_func,
+                                                       simix_process);
 }
 
 /**
@@ -207,7 +210,7 @@ static XBT_INLINE smx_context_t SIMIX_context_new(xbt_main_func_t code,
  */
 static XBT_INLINE void SIMIX_context_free(smx_context_t context)
 {
-  (*(simix_global->context_factory->free)) (context);
+  simix_global->context_factory->free(context);
 }
 
 /**
@@ -216,7 +219,7 @@ static XBT_INLINE void SIMIX_context_free(smx_context_t context)
  */
 static XBT_INLINE void SIMIX_context_stop(smx_context_t context)
 {
-  (*(simix_global->context_factory->stop)) (context);
+  simix_global->context_factory->stop(context);
 }
 
 /**
@@ -226,16 +229,15 @@ static XBT_INLINE void SIMIX_context_stop(smx_context_t context)
  */
 static XBT_INLINE void SIMIX_context_suspend(smx_context_t context)
 {
-  (*(simix_global->context_factory->suspend)) (context);
+  simix_global->context_factory->suspend(context);
 }
 
 /**
- \brief executes all the processes (in parallel if possible)
- \param processes the dynar of processes to execute
+ \brief Executes all the processes to run (in parallel if possible).
  */
-static XBT_INLINE void SIMIX_context_runall(xbt_dynar_t processes)
+static XBT_INLINE void SIMIX_context_runall()
 {
-  (*(simix_global->context_factory->runall)) (processes);
+  simix_global->context_factory->runall();
 }
 
 /**
@@ -244,7 +246,7 @@ static XBT_INLINE void SIMIX_context_runall(xbt_dynar_t processes)
 static XBT_INLINE smx_context_t SIMIX_context_self(void)
 {
   if (simix_global && simix_global->context_factory != NULL) {
-    return (*(simix_global->context_factory->self))();
+    return simix_global->context_factory->self();
   }
 
   return NULL;
@@ -257,16 +259,7 @@ static XBT_INLINE smx_context_t SIMIX_context_self(void)
  */
 static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
 {
-  return (*(simix_global->context_factory->get_data))(context);
-}
-
-/**
- \brief returns the thread's pid running the current context
- \return The pid
- */
-static XBT_INLINE int SIMIX_context_get_thread_id(void)
-{
-  return (*(simix_global->context_factory->get_thread_id))();
+  return simix_global->context_factory->get_data(context);
 }
 
 XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);