X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ea7c6220ef3aea972da1ce8fff827e0209f7052..356d964ef596cb5f8905b6a6f54a1053d8ad86b6:/src/simix/smx_private.h diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 2e3ca93616..472d5233ff 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -37,14 +37,17 @@ typedef struct s_smx_global { smx_process_t maestro_process; xbt_dict_t registered_functions; smx_creation_func_t create_process_function; - void_pfn_smxprocess_t kill_process_function; + void_pfn_smxprocess_t_smxprocess_t kill_process_function; void_pfn_smxprocess_t cleanup_process_function; xbt_mallocator_t action_mallocator; + void_pfn_smxhost_t autorestart; } s_smx_global_t, *smx_global_t; extern smx_global_t simix_global; extern unsigned long simix_process_maxpid; +extern xbt_dict_t watched_hosts_lib; + /******************************** Exceptions *********************************/ #define SMX_EXCEPTION(issuer, c, v, m) \ @@ -140,9 +143,9 @@ typedef struct s_smx_action { void *dst_buff; size_t src_buff_size; size_t *dst_buff_size; - char copied; + unsigned copied:1; /* whether the data were already copied */ - void* src_data; /* User data associated to communication */ + void* src_data; /* User data associated to communication */ void* dst_data; } comm; @@ -281,7 +284,7 @@ static XBT_INLINE void SIMIX_context_runall(void) */ static XBT_INLINE smx_context_t SIMIX_context_self(void) { - if (simix_global && simix_global->context_factory != NULL) { + if (simix_global && simix_global->context_factory) { return simix_global->context_factory->self(); }