Fix another race in log initializations.

[simgrid.git] / src / simix / smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index e15730f..9c25e48 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -79,7 +79,7 @@ typedef struct s_smx_action {
   e_smx_action_type_t type;          /* Type of SIMIX action*/
   e_smx_state_t state;               /* State of the action */
   char *name;                        /* Action name if any */
-  xbt_fifo_t request_list;           /* List of requests on this action */
+  xbt_fifo_t simcalls;               /* List of simcalls waiting for this action */
 
   /* Data specific to each action type */
   union {
@@ -161,8 +161,8 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta
 void SIMIX_context_mod_init(void);
 void SIMIX_context_mod_exit(void);
 
-XBT_INLINE void SIMIX_context_set_current(smx_context_t context);
-XBT_INLINE smx_context_t SIMIX_context_get_current(void);
+void SIMIX_context_set_current(smx_context_t context);
+smx_context_t SIMIX_context_get_current(void);
 
 /* All factories init */
 void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory);