X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4dbb8aa24d54e0a4091b1f01017032702d0376f7..972791c2823bfc1694d827b1e943eb725847e2d8:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 70fc02cba3..bd12391e93 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -17,6 +17,26 @@ #include "simgrid/datatypes.h" #include "simgrid/host.h" + +#ifdef __cplusplus + +namespace simgrid { +namespace simix { + class Context; + class ContextFactory; +} +} + +typedef simgrid::simix::Context *smx_context_t; + +#else + +typedef struct s_smx_context *smx_context_t; + +#endif + + + SG_BEGIN_DECL() /**************************** Scalar Values **********************************/ @@ -124,85 +144,17 @@ typedef struct s_smx_rvpoint *smx_rdv_t; XBT_PUBLIC(void*) SIMIX_comm_get_src_data(smx_synchro_t synchro); XBT_PUBLIC(void*) SIMIX_comm_get_dst_data(smx_synchro_t synchro); -/******************************** Context *************************************/ -typedef struct s_smx_context *smx_context_t; -typedef struct s_smx_context_factory *smx_context_factory_t; - /* Process creation/destruction callbacks */ typedef void (*void_pfn_smxprocess_t) (smx_process_t); -/* Process kill */ -typedef void (*void_pfn_smxprocess_t_smxprocess_t) (smx_process_t, smx_process_t); /* for auto-restart function */ typedef void (*void_pfn_sghost_t) (sg_host_t); -/* 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 process); -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) (void); -typedef smx_context_t (*smx_pfn_context_self_t) (void); -typedef smx_process_t (*smx_pfn_context_get_process_t) (smx_context_t context); - -/* interface of the context factories */ -typedef struct s_smx_context_factory { - const char *name; - 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; - smx_pfn_context_get_process_t get_process; -} s_smx_context_factory_t; - -/* Hack: let msg load directly the right factory */ -typedef void (*smx_ctx_factory_initializer_t)(smx_context_factory_t*); -XBT_PUBLIC_DATA(smx_ctx_factory_initializer_t) smx_factory_initializer_to_use; extern char* smx_context_factory_name; extern int smx_context_stack_size; extern int smx_context_stack_size_was_set; extern int smx_context_guard_size; extern int smx_context_guard_size_was_set; -/* *********************** */ -/* Context type definition */ -/* *********************** */ -/* the following function pointers types describe the interface that all context - concepts must implement */ -/* each context type derive from this structure, so they must contain this structure - * at their beginning -- OOP in C :/ */ -typedef struct s_smx_context { - s_xbt_swag_hookup_t hookup; - xbt_main_func_t code; - void_pfn_smxprocess_t cleanup_func; - smx_process_t process; - char **argv; - int argc; - unsigned iwannadie:1; -} s_smx_ctx_base_t; - -/* methods of this class */ -XBT_PUBLIC(void) smx_ctx_base_factory_init(smx_context_factory_t *factory); -XBT_PUBLIC(int) smx_ctx_base_factory_finalize(smx_context_factory_t *factory); - -XBT_PUBLIC(smx_context_t) -smx_ctx_base_factory_create_context_sized(size_t size, xbt_main_func_t code, - int argc, char **argv, - void_pfn_smxprocess_t cleanup, - smx_process_t process); -XBT_PUBLIC(void) smx_ctx_base_free(smx_context_t context); -XBT_PUBLIC(void) smx_ctx_base_stop(smx_context_t context); -XBT_PUBLIC(smx_context_t) smx_ctx_base_self(void); -XBT_PUBLIC(smx_process_t) smx_ctx_base_get_process(smx_context_t context); - XBT_PUBLIC(xbt_dynar_t) SIMIX_process_get_runnable(void); XBT_PUBLIC(smx_process_t) SIMIX_process_from_PID(int PID); XBT_PUBLIC(xbt_dynar_t) SIMIX_processes_as_dynar(void); @@ -215,7 +167,7 @@ XBT_PUBLIC(int) SIMIX_context_get_parallel_threshold(void); XBT_PUBLIC(void) SIMIX_context_set_parallel_threshold(int threshold); XBT_PUBLIC(e_xbt_parmap_mode_t) SIMIX_context_get_parallel_mode(void); XBT_PUBLIC(void) SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode); - +XBT_PUBLIC(int) SIMIX_is_maestro(); /********************************** Global ************************************/ @@ -225,7 +177,7 @@ XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv); XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function); XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function); -XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t_smxprocess_t function); +XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t function); /* Simulation execution */ XBT_PUBLIC(void) SIMIX_run(void); @@ -234,7 +186,7 @@ XBT_PUBLIC(double) SIMIX_get_clock(void); /* Timer functions FIXME: should these be public? */ typedef struct s_smx_timer* smx_timer_t; -XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, void *function, void *arg); +XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, void (*function)(void*), void *arg); XBT_PUBLIC(void) SIMIX_timer_remove(smx_timer_t timer); XBT_PUBLIC(double) SIMIX_timer_next(void); XBT_PUBLIC(double) SIMIX_timer_get_date(smx_timer_t timer); @@ -261,12 +213,11 @@ XBT_PUBLIC(void) SIMIX_process_set_function(const char* process_host, /*********************************** Host *************************************/ XBT_PUBLIC(sg_host_t) SIMIX_host_self(void); XBT_PUBLIC(const char*) SIMIX_host_self_get_name(void); -#define SIMIX_host_get_name(h) sg_host_name(h) /* DEPRECATED: SIMIX_host_get_name */ XBT_PUBLIC(void) SIMIX_host_on(sg_host_t host); XBT_PUBLIC(void) SIMIX_host_off(sg_host_t host, smx_process_t issuer); XBT_PUBLIC(void) SIMIX_host_self_set_data(void *data); XBT_PUBLIC(void*) SIMIX_host_self_get_data(void); -XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_mounted_storage_list(sg_host_t host); + /********************************* Process ************************************/ XBT_PUBLIC(int) SIMIX_process_count(void); XBT_PUBLIC(smx_process_t) SIMIX_process_self(void); @@ -278,6 +229,7 @@ XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c); XBT_PUBLIC(int) SIMIX_process_has_pending_comms(smx_process_t process); XBT_PUBLIC(void) SIMIX_process_on_exit_runall(smx_process_t process); XBT_PUBLIC(void) SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data); +XBT_PUBLIC(xbt_main_func_t) SIMIX_process_get_code(void); /****************************** Communication *********************************/ XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_synchro_t, void*, size_t)); @@ -296,49 +248,35 @@ XBT_PUBLIC(void) SIMIX_comm_finish(smx_synchro_t synchro); /* They can also be called from maestro's context, and they are thread safe. */ /******************************************************************************/ +XBT_PUBLIC(void) simcall_call(smx_process_t process); + /******************************* Host simcalls ********************************/ /* TODO use handlers and keep sg_host_t hidden from higher levels */ -XBT_PUBLIC(const char *) simcall_host_get_name(sg_host_t host); -XBT_PUBLIC(xbt_dict_t) simcall_host_get_properties(sg_host_t host); -XBT_PUBLIC(void) simcall_host_on(sg_host_t host); -XBT_PUBLIC(void) simcall_host_off(sg_host_t host); -XBT_PUBLIC(int) simcall_host_get_core(sg_host_t host); XBT_PUBLIC(xbt_swag_t) simcall_host_get_process_list(sg_host_t host); -XBT_PUBLIC(double) simcall_host_get_speed(sg_host_t host); -XBT_PUBLIC(double) simcall_host_get_available_speed(sg_host_t host); -/* Two possible states, 1 - CPU ON and 0 CPU OFF */ -XBT_PUBLIC(int) simcall_host_get_state(sg_host_t host); -XBT_PUBLIC(void *) simcall_host_get_data(sg_host_t host); - XBT_PUBLIC(void) simcall_host_set_data(sg_host_t host, void *data); XBT_PUBLIC(double) simcall_host_get_current_power_peak(sg_host_t host); XBT_PUBLIC(double) simcall_host_get_power_peak_at(sg_host_t host, int pstate_index); -XBT_PUBLIC(int) simcall_host_get_nb_pstates(sg_host_t host); -XBT_PUBLIC(void) simcall_host_set_pstate(sg_host_t host, int pstate_index); -XBT_PUBLIC(int) simcall_host_get_pstate(sg_host_t host); -XBT_PUBLIC(double) simcall_host_get_consumed_energy(sg_host_t host); -XBT_PUBLIC(double) simcall_host_get_wattmin_at(sg_host_t host, int pstate); -XBT_PUBLIC(double) simcall_host_get_wattmax_at(sg_host_t host, int pstate); - -XBT_PUBLIC(smx_synchro_t) simcall_process_execute(const char *name, + +XBT_PUBLIC(smx_synchro_t) simcall_execution_start(const char *name, double flops_amount, double priority, double bound, unsigned long affinity_mask); -XBT_PUBLIC(smx_synchro_t) simcall_process_parallel_execute(const char *name, +XBT_PUBLIC(smx_synchro_t) simcall_execution_parallel_start(const char *name, int host_nb, sg_host_t *host_list, double *flops_amount, double *bytes_amount, double amount, double rate); -XBT_PUBLIC(void) simcall_process_execution_destroy(smx_synchro_t execution); -XBT_PUBLIC(void) simcall_process_execution_cancel(smx_synchro_t execution); -XBT_PUBLIC(double) simcall_process_execution_get_remains(smx_synchro_t execution); -XBT_PUBLIC(e_smx_state_t) simcall_process_execution_get_state(smx_synchro_t execution); -XBT_PUBLIC(void) simcall_process_execution_set_priority(smx_synchro_t execution, double priority); -XBT_PUBLIC(void) simcall_process_execution_set_bound(smx_synchro_t execution, double bound); -XBT_PUBLIC(void) simcall_process_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask); -XBT_PUBLIC(e_smx_state_t) simcall_process_execution_wait(smx_synchro_t execution); +XBT_PUBLIC(void) simcall_execution_destroy(smx_synchro_t execution); +XBT_PUBLIC(void) simcall_execution_cancel(smx_synchro_t execution); +XBT_PUBLIC(double) simcall_execution_get_remains(smx_synchro_t execution); +XBT_PUBLIC(e_smx_state_t) simcall_execution_get_state(smx_synchro_t execution); +XBT_PUBLIC(void) simcall_execution_set_priority(smx_synchro_t execution, double priority); +XBT_PUBLIC(void) simcall_execution_set_bound(smx_synchro_t execution, double bound); +XBT_PUBLIC(void) simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask); +XBT_PUBLIC(e_smx_state_t) simcall_execution_wait(smx_synchro_t execution); + XBT_PUBLIC(xbt_dict_t) simcall_host_get_mounted_storage_list(sg_host_t host); XBT_PUBLIC(xbt_dynar_t) simcall_host_get_attached_storage_list(sg_host_t host); XBT_PUBLIC(void) simcall_host_get_params(sg_host_t vm, vm_params_t param); @@ -472,13 +410,13 @@ XBT_PUBLIC(void) simcall_set_category(smx_synchro_t synchro, const char *categor /************************** Synchro simcalls **********************************/ XBT_PUBLIC(smx_mutex_t) simcall_mutex_init(void); -XBT_PUBLIC(void) simcall_mutex_destroy(smx_mutex_t mutex); +XBT_PUBLIC(void) SIMIX_mutex_destroy(smx_mutex_t mutex); XBT_PUBLIC(void) simcall_mutex_lock(smx_mutex_t mutex); XBT_PUBLIC(int) simcall_mutex_trylock(smx_mutex_t mutex); XBT_PUBLIC(void) simcall_mutex_unlock(smx_mutex_t mutex); XBT_PUBLIC(smx_cond_t) simcall_cond_init(void); -XBT_PUBLIC(void) simcall_cond_destroy(smx_cond_t cond); +XBT_PUBLIC(void) SIMIX_cond_destroy(smx_cond_t cond); XBT_PUBLIC(void) simcall_cond_signal(smx_cond_t cond); XBT_PUBLIC(void) simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex); XBT_PUBLIC(void) simcall_cond_wait_timeout(smx_cond_t cond, @@ -487,7 +425,7 @@ XBT_PUBLIC(void) simcall_cond_wait_timeout(smx_cond_t cond, XBT_PUBLIC(void) simcall_cond_broadcast(smx_cond_t cond); XBT_PUBLIC(smx_sem_t) simcall_sem_init(int capacity); -XBT_PUBLIC(void) simcall_sem_destroy(smx_sem_t sem); +XBT_PUBLIC(void) SIMIX_sem_destroy(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_release(smx_sem_t sem); XBT_PUBLIC(int) simcall_sem_would_block(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_acquire(smx_sem_t sem);