X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d153de8eb3f64313d265a111e3a3ebf7062e88c..6139ac45b7aebbc5c54f8a644843f78e88d5e2be:/src/simix/smx_private.h diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 61acf3b323..257ea0e9d6 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -7,13 +7,14 @@ #ifndef _SIMIX_PRIVATE_H #define _SIMIX_PRIVATE_H -#include "simix/simix.h" +#include "simgrid/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" #include "xbt/swag.h" #include "xbt/dict.h" #include "xbt/mallocator.h" #include "xbt/config.h" +#include "xbt/xbt_os_time.h" #include "xbt/function_types.h" #include "xbt/ex_interface.h" #include "instr/instr_private.h" @@ -23,10 +24,14 @@ #include "smx_network_private.h" #include "smx_smurf_private.h" #include "smx_synchro_private.h" -#include "simix/context.h" +/* ****************************************************************************************** */ +/* TUTORIAL: New API */ +/* ****************************************************************************************** */ +#include "smx_new_api_private.h" /* Define only for SimGrid benchmarking purposes */ -#undef TIME_BENCH +//#define TIME_BENCH_PER_SR /* this aims at measuring the time spent in each scheduling round per each thread. The code is thus run in sequential to bench separately each SSR */ +//#define TIME_BENCH_AMDAHL /* this aims at measuring the porting of time that could be parallelized at maximum (to get the optimal speedup by applying the amdahl law). */ /********************************** Simix Global ******************************/ typedef struct s_smx_global { @@ -38,14 +43,22 @@ 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; + +#ifdef TIME_BENCH_AMDAHL + xbt_os_timer_t timer_seq; /* used to bench the sequential and parallel parts of the simulation, if requested to */ + xbt_os_timer_t timer_par; +#endif } 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) \ @@ -83,7 +96,11 @@ typedef enum { SIMIX_ACTION_COMMUNICATE, SIMIX_ACTION_SLEEP, SIMIX_ACTION_SYNCHRO, - SIMIX_ACTION_IO + SIMIX_ACTION_IO, + /* ****************************************************************************************** */ + /* TUTORIAL: New API */ + /* ****************************************************************************************** */ + SIMIX_ACTION_NEW_API } e_smx_action_type_t; typedef enum { @@ -123,6 +140,9 @@ typedef struct s_smx_action { int detached; /* If detached or not */ void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */ + int (*match_fun)(void*,void*,smx_action_t); /* Filter function used by the other side. It is used when + looking if a given communication matches my needs. For that, myself must match the + expectations of the other side, too. See */ /* Surf action data */ surf_action_t surf_comm; /* The Surf communication action encapsulated */ @@ -138,9 +158,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; @@ -157,6 +177,13 @@ typedef struct s_smx_action { smx_host_t host; surf_action_t surf_io; } io; + + /* ****************************************************************************************** */ + /* TUTORIAL: New API */ + /* ****************************************************************************************** */ + struct { + surf_action_t surf_new_api; + } new_api; }; #ifdef HAVE_LATENCY_BOUND_TRACKING @@ -185,8 +212,6 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta } } -int process_syscall_color(void *p); - void SIMIX_context_mod_init(void); void SIMIX_context_mod_exit(void); @@ -194,6 +219,7 @@ void SIMIX_context_set_current(smx_context_t context); smx_context_t SIMIX_context_get_current(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); @@ -232,7 +258,8 @@ static XBT_INLINE smx_context_t SIMIX_context_new(xbt_main_func_t code, void_pfn_smxprocess_t cleanup_func, smx_process_t simix_process) { - + if (!simix_global) + xbt_die("simix is not initialized, please call MSG_init first"); return simix_global->context_factory->create_context(code, argc, argv, cleanup_func, @@ -273,7 +300,9 @@ static XBT_INLINE void SIMIX_context_suspend(smx_context_t context) */ static XBT_INLINE void SIMIX_context_runall(void) { - simix_global->context_factory->runall(); + if (!xbt_dynar_is_empty(simix_global->process_to_run)) { + simix_global->context_factory->runall(); + } } /** @@ -281,10 +310,9 @@ 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(); } - return NULL; } @@ -299,4 +327,7 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context) } XBT_PUBLIC(int) SIMIX_process_get_maxpid(void); + +void SIMIX_post_create_environment(void); + #endif