X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f70dd8e147b6331d56b0f25e9111431280669fe..08ce0edd12b2c42378cc228a91d37613bbc2acbc:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index 676d923852..2008f9c1eb 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -30,8 +30,8 @@ /********************************** 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; @@ -151,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); @@ -231,12 +231,11 @@ static XBT_INLINE void SIMIX_context_suspend(smx_context_t 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)) (); } /** @@ -261,14 +260,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