X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..8f53b49a3b699b15a97868ce7a137e9e43de444c:/src/simix/private.h diff --git a/src/simix/private.h b/src/simix/private.h index 74a851ee63..5aadc796a3 100644 --- a/src/simix/private.h +++ b/src/simix/private.h @@ -15,38 +15,32 @@ #include "xbt/config.h" #include "xbt/function_types.h" #include "xbt/ex_interface.h" -#include "instr/private.h" +#include "instr/instr_private.h" #include "process_private.h" #include "host_private.h" #include "network_private.h" #include "smurf_private.h" #include "synchro_private.h" - -extern int _surf_do_model_check; +#include "simix/context.h" /********************************** Simix Global ******************************/ -typedef struct s_smx_context_factory *smx_context_factory_t; -typedef struct SIMIX_Global { +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 current_process; smx_process_t maestro_process; xbt_dict_t registered_functions; 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_SIMIX_Global_t, *SIMIX_Global_t; - -extern SIMIX_Global_t simix_global; +} s_smx_global_t, *smx_global_t; +extern smx_global_t simix_global; +extern unsigned long simix_process_maxpid; /*********************************** Time ************************************/ @@ -95,6 +89,7 @@ typedef struct s_smx_action { e_smx_comm_type_t type; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */ smx_rdv_t rdv; /* Rendez-vous where the comm is queued */ int refcount; /* Number of processes involved in the cond */ + int detached; /* If detached or not */ /* Surf action data */ surf_action_t surf_comm; /* The Surf communication action encapsulated */ @@ -112,7 +107,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,11 +119,14 @@ typedef struct s_smx_action { struct { surf_action_t sleep; } synchro; - + }; +#ifdef HAVE_LATENCY_BOUND_TRACKING + int latency_limited; +#endif + #ifdef HAVE_TRACING - long long int counter; /* simix action unique identifier for instrumentation */ char *category; /* simix action category for instrumentation */ #endif } s_smx_action_t; @@ -149,44 +148,16 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta } } -/******************************** Context *************************************/ - -/* The following function pointer types describe the interface that any context - factory should implement */ - - -typedef smx_context_t(*smx_pfn_context_factory_create_context_t) - (xbt_main_func_t, int, char **, void_pfn_smxprocess_t, smx_process_t); -typedef int (*smx_pfn_context_factory_finalize_t) (smx_context_factory_t - *); -typedef void (*smx_pfn_context_free_t) (smx_context_t); -typedef void (*smx_pfn_context_start_t) (smx_context_t); -typedef void (*smx_pfn_context_stop_t) (smx_context_t); -typedef void (*smx_pfn_context_suspend_t) (smx_context_t context); -typedef void (*smx_pfn_context_runall_t) (xbt_swag_t processes); -typedef smx_process_t (*smx_pfn_context_self_t) (void); - -/* interface of the context factories */ -typedef struct s_smx_context_factory { - smx_pfn_context_factory_create_context_t create_context; - smx_pfn_context_factory_finalize_t finalize; - smx_pfn_context_free_t free; - smx_pfn_context_stop_t stop; - smx_pfn_context_suspend_t suspend; - smx_pfn_context_runall_t runall; - smx_pfn_context_self_t self; - const char *name; -} s_smx_context_factory_t; void SIMIX_context_mod_init(void); - 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_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 */ @@ -258,24 +229,43 @@ 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); } /** - \brief returns the current running process + \brief returns the current running context */ -static XBT_INLINE smx_process_t SIMIX_context_self(void) +static XBT_INLINE smx_context_t SIMIX_context_self(void) { - if (simix_global->context_factory == NULL) { - return NULL; + if (simix_global && simix_global->context_factory != NULL) { + return (*(simix_global->context_factory->self))(); } - return (*(simix_global->context_factory->self))(); + return NULL; } +/** + \brief returns the data associated to a context + \param context The context + \return The data + */ +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