X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15142e98775405b23e3059da088d4aeecb906b78..39b6ed28636c4d67a0127d8526bf10dbc212cdc9:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index 09c76f4fb0..7b2d98c3c3 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -24,13 +24,14 @@ #include "synchro_private.h" #include "simix/context.h" -/********************************** Simix Global ******************************/ - +/* Define only for SimGrid benchmarking purposes */ +#undef TIME_BENCH +/********************************** Simix Global ******************************/ typedef struct s_smx_global { smx_context_factory_t context_factory; - xbt_dict_t host; 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; @@ -150,11 +151,11 @@ 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); /* All factories init */ void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory); @@ -260,14 +261,5 @@ 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))(); -} - XBT_PUBLIC(int) SIMIX_process_get_maxpid(void); #endif