X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87dcbdd62cdd688ee0d9cefc7ae54854148ec5fb..25dad2df2f0ab55b6f5e3e00ad8a873c66368cc0:/src/include/simix/simix.h diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h index 1a892e5977..616db0ad5f 100644 --- a/src/include/simix/simix.h +++ b/src/include/simix/simix.h @@ -10,73 +10,104 @@ #define _SIMIX_SIMIX_H #include "xbt/misc.h" +#include "xbt/fifo.h" +#include "xbt/function_types.h" #include "simix/datatypes.h" +#include "surf/surf.h" SG_BEGIN_DECL() /************************** Global ******************************************/ -XBT_PUBLIC(void) SIMIX_config(const char *name, ...); +XBT_PUBLIC(void) SIMIX_config(const char *name, va_list pa); XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv); -XBT_PUBLIC(void) SIMIX_global_init_args(int *argc, char **argv); -XBT_PUBLIC(SIMIX_error_t) SIMIX_main(void); -XBT_PUBLIC(SIMIX_error_t) SIMIX_clean(void); -XBT_PUBLIC(void) SIMIX_function_register(const char *name, smx_process_code_t code); -XBT_PUBLIC(smx_process_code_t) SIMIX_get_registered_function(const char *name); -// SIMIX_deploy_application??? +XBT_PUBLIC(void) SIMIX_clean(void); +XBT_PUBLIC(void) SIMIX_function_register(const char *name, xbt_main_func_t code); +XBT_PUBLIC(xbt_main_func_t) SIMIX_get_registered_function(const char *name); + XBT_PUBLIC(void) SIMIX_launch_application(const char *file); XBT_PUBLIC(double) SIMIX_get_clock(void); +XBT_PUBLIC(double) SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed); + +/* Timer functions */ +XBT_PUBLIC(void) SIMIX_timer_set (double date, void *function, void *arg); +XBT_PUBLIC(int) SIMIX_timer_get(void **function, void **arg); + +/* only for tests */ +XBT_PUBLIC(void) __SIMIX_main(void); + +/* User create and kill process, the function must accept the folling parameters: + * const char *name: a name for the object. It is for user-level information and can be NULL + * xbt_main_func_t code: is a function describing the behavior of the agent + * void *data: data a pointer to any data one may want to attach to the new object. + * smx_host_t host: the location where the new agent is executed + * int argc, char **argv: parameters passed to code + * + * */ +typedef void *(smx_creation_func_t)(/*name*/ const char *, + /*code*/ xbt_main_func_t, + /*userdata*/ void *, + /*hostname*/ char *, + /* argc */ int, + /* argv */ char **); +XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t *function); +XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_f_pvoid_t *function); +XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_f_pvoid_t *function); /************************** Host handling ***********************************/ -//pointer to above layer -XBT_PUBLIC(SIMIX_error_t) SIMIX_host_set_data(smx_host_t host, void *data); + +XBT_PUBLIC(void) SIMIX_host_set_data(smx_host_t host, void *data); XBT_PUBLIC(void*) SIMIX_host_get_data(smx_host_t host); XBT_PUBLIC(const char *) SIMIX_host_get_name(smx_host_t host); XBT_PUBLIC(smx_host_t) SIMIX_host_self(void); -/* int SIMIX_get_msgload(void); This function lacks specification; discard it */ -XBT_PUBLIC(double) SIMIX_get_host_speed(smx_host_t h); -XBT_PUBLIC(int) SIMIX_host_is_avail (smx_host_t h); +XBT_PUBLIC(double) SIMIX_host_get_speed(smx_host_t host); +XBT_PUBLIC(double) SIMIX_host_get_available_speed(smx_host_t host); + +XBT_PUBLIC(int) SIMIX_host_get_number(void); +XBT_PUBLIC(smx_host_t *)SIMIX_host_get_table(void); XBT_PUBLIC(void) SIMIX_create_environment(const char *file); +XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name); -XBT_PUBLIC(smx_host_t) SIMIX_get_host_by_name(const char *name); -XBT_PUBLIC(int) SIMIX_get_host_number(void); -XBT_PUBLIC(smx_host_t *)SIMIX_get_host_table(void); +/* Two possible states, 1 - CPU ON and 0 CPU OFF */ +XBT_PUBLIC(int) SIMIX_host_get_state(smx_host_t host); /************************** Process handling *********************************/ XBT_PUBLIC(smx_process_t) SIMIX_process_create(const char *name, - smx_process_code_t code, void *data, - smx_host_t host); -XBT_PUBLIC(smx_process_t) SIMIX_process_create_with_arguments(const char *name, - smx_process_code_t code, void *data, - smx_host_t host, int argc, char **argv); + xbt_main_func_t code, void *data, + const char * hostname, int argc, char **argv); + +XBT_PUBLIC(void) SIMIX_jprocess_create(const char *name, + smx_host_t host, + void *data, + void *jprocess, void *jenv, + smx_process_t* res); + XBT_PUBLIC(void) SIMIX_process_kill(smx_process_t process); +XBT_PUBLIC(void) SIMIX_process_cleanup(void *arg); XBT_PUBLIC(void) SIMIX_process_killall(void); -XBT_PUBLIC(SIMIX_error_t) SIMIX_process_change_host(smx_process_t process, smx_host_t host); //above layer XBT_PUBLIC(void*) SIMIX_process_get_data(smx_process_t process); -XBT_PUBLIC(SIMIX_error_t) SIMIX_process_set_data(smx_process_t process, void *data); +XBT_PUBLIC(void) SIMIX_process_set_data(smx_process_t process, void *data); XBT_PUBLIC(smx_host_t) SIMIX_process_get_host(smx_process_t process); XBT_PUBLIC(const char *)SIMIX_process_get_name(smx_process_t process); XBT_PUBLIC(smx_process_t) SIMIX_process_self(void); -XBT_PUBLIC(SIMIX_error_t) SIMIX_process_suspend(smx_process_t process); -XBT_PUBLIC(SIMIX_error_t) SIMIX_process_resume(smx_process_t process); +XBT_PUBLIC(void) SIMIX_process_suspend(smx_process_t process); +XBT_PUBLIC(void) SIMIX_process_resume(smx_process_t process); XBT_PUBLIC(int) SIMIX_process_is_suspended(smx_process_t process); -XBT_PUBLIC(SIMIX_error_t) SIMIX_process_sleep(double nb_sec); -XBT_PUBLIC(SIMIX_error_t) SIMIX_get_errno(void); /************************** Synchro handling **********************************/ /******Mutex******/ XBT_PUBLIC(smx_mutex_t) SIMIX_mutex_init(void); XBT_PUBLIC(void) SIMIX_mutex_lock(smx_mutex_t mutex); -XBT_PUBLIC(void) SIMIX_mutex_trylock(smx_mutex_t mutex); +XBT_PUBLIC(int) SIMIX_mutex_trylock(smx_mutex_t mutex); XBT_PUBLIC(void) SIMIX_mutex_unlock(smx_mutex_t mutex); XBT_PUBLIC(void) SIMIX_mutex_destroy(smx_mutex_t mutex); @@ -87,16 +118,40 @@ XBT_PUBLIC(void) SIMIX_cond_wait(smx_cond_t cond,smx_mutex_t mutex); XBT_PUBLIC(void) SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, double max_duration); XBT_PUBLIC(void) SIMIX_cond_broadcast(smx_cond_t cond); XBT_PUBLIC(void) SIMIX_cond_destroy(smx_cond_t cond); +XBT_PUBLIC(xbt_fifo_t) SIMIX_cond_get_actions(smx_cond_t cond); /************************** Action handling ************************************/ -XBT_PUBLIC(smx_action_t) SIMIX_communicate(smx_host_t sender,smx_host_t receiver, double size); -XBT_PUBLIC(smx_action_t) SIMIX_execute(smx_host_t host,double amount); -XBT_PUBLIC(SIMIX_error_t) SIMIX_action_cancel(smx_action_t action); +XBT_PUBLIC(smx_action_t) SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver, const char *name, + double size, double rate); +XBT_PUBLIC(smx_action_t) SIMIX_action_execute(smx_host_t host,char *name, double amount); +XBT_PUBLIC(smx_action_t) SIMIX_action_sleep(smx_host_t host, double amount); +XBT_PUBLIC(void) SIMIX_action_cancel(smx_action_t action); XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority); -XBT_PUBLIC(SIMIX_error_t) SIMIX_action_destroy(smx_action_t action); +XBT_PUBLIC(void) SIMIX_action_destroy(smx_action_t action); +XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond); +XBT_PUBLIC(void) SIMIX_unregister_action_to_condition(smx_action_t action, smx_cond_t cond); +XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action); + +XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action); + +XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name, + int host_nb, + smx_host_t *host_list, + double *computation_amount, + double *communication_amount, + double amount, + double rate); + +void SIMIX_display_process_status(void); + +/* Helper functions for jMSG: manipulate the context data without breaking the module separation */ +void SIMIX_process_set_jprocess(smx_process_t process, void *jp); +void* SIMIX_process_get_jprocess(smx_process_t process); +void SIMIX_process_set_jenv(smx_process_t process, void *je); +void* SIMIX_process_get_jenv(smx_process_t process); -//SIMIX_action_wait_for_computation(smx_process_t process, smx_action_t action); SG_END_DECL() + #endif /* _SIMIX_SIMIX_H */