X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f78f258fa50770dc3f9786fc80eed9557e37ed4..44e27d4d66f84c93eeb048d127f6b341c222b1e0:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index 475208e91b..ee605a429b 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -29,7 +29,7 @@ typedef struct s_smx_global { smx_context_factory_t context_factory; xbt_dict_t host; - xbt_swag_t process_to_run; + xbt_dynar_t process_to_run; xbt_swag_t process_list; xbt_swag_t process_to_destroy; smx_process_t maestro_process; @@ -37,9 +37,6 @@ typedef struct s_smx_global { smx_creation_func_t create_process_function; void_f_pvoid_t kill_process_function; void_pfn_smxprocess_t cleanup_process_function; -#ifdef HAVE_LATENCY_BOUND_TRACKING - xbt_dict_t latency_limited_dict; -#endif } s_smx_global_t, *smx_global_t; extern smx_global_t simix_global; @@ -109,7 +106,8 @@ typedef struct s_smx_action { size_t *dst_buff_size; char copied; - void *data; /* User data associated to communication */ + void* src_data; /* User data associated to communication */ + void* dst_data; } comm; struct { @@ -123,6 +121,10 @@ typedef struct s_smx_action { }; +#ifdef HAVE_LATENCY_BOUND_TRACKING + int latency_limited; +#endif + #ifdef HAVE_TRACING char *category; /* simix action category for instrumentation */ #endif @@ -154,6 +156,7 @@ void SIMIX_context_mod_exit(void); /* All factories init */ void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory); void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory); +void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory); /* ****************************** */ /* context manipulation functions */ @@ -225,9 +228,9 @@ static XBT_INLINE void SIMIX_context_suspend(smx_context_t context) /** \brief executes all the processes (in parallel if possible) - \param processes the swag of processes to execute + \param processes the dynar of processes to execute */ -static XBT_INLINE void SIMIX_context_runall(xbt_swag_t processes) +static XBT_INLINE void SIMIX_context_runall(xbt_dynar_t processes) { (*(simix_global->context_factory->runall)) (processes); } @@ -254,4 +257,5 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context) return (*(simix_global->context_factory->get_data))(context); } +XBT_PUBLIC(int) SIMIX_process_get_maxpid(void); #endif