X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b1016c3ad9e396286bf2c692c92cf5fd567b1d3..ed9b07e5c0c7eb6d4d38b0fe5aaea80d6996a8a7:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 02ef86dda6..a79adf3726 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -75,8 +75,8 @@ typedef struct s_smx_file *smx_file_t; typedef xbt_dictelm_t smx_storage_t; typedef struct s_smx_storage_priv *smx_storage_priv_t; -/********************************** Action *************************************/ -typedef struct s_smx_action *smx_action_t; /* FIXME: replace by specialized action handlers */ +/********************************** Synchro *************************************/ +typedef struct s_smx_synchro *smx_synchro_t; /* FIXME: replace by specialized synchro handlers */ /* ****************************** Process *********************************** */ /** @brief Process datatype @@ -87,6 +87,10 @@ typedef struct s_smx_action *smx_action_t; /* FIXME: replace by specialized acti \see m_process_management @{ */ typedef struct s_smx_process *smx_process_t; +typedef enum { + SMX_EXIT_SUCCESS = 0, + SMX_EXIT_FAILURE = 1 +} smx_process_exit_status_t; /** @} */ @@ -120,8 +124,8 @@ typedef void (*smx_creation_func_t) ( /* process */ smx_process_t*, */ typedef struct s_smx_rvpoint *smx_rdv_t; -XBT_PUBLIC(void*) SIMIX_comm_get_src_data(smx_action_t action); -XBT_PUBLIC(void*) SIMIX_comm_get_dst_data(smx_action_t action); +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; @@ -227,7 +231,7 @@ XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t func XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t_smxprocess_t function); /* Simulation execution */ -XBT_PUBLIC(void) SIMIX_run(void); +XBT_PUBLIC(void) SIMIX_run(void); XBT_PUBLIC(double) SIMIX_get_clock(void); /* Timer functions FIXME: should these be public? */ @@ -274,17 +278,17 @@ XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t); 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_t fun, void *data); +XBT_PUBLIC(void) SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data); /****************************** Communication *********************************/ -XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_t, void*, size_t)); -XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_action_t comm, void* buff, size_t buff_size); -XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size); +XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_synchro_t, void*, size_t)); +XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_synchro_t comm, void* buff, size_t buff_size); +XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_synchro_t comm, void* buff, size_t buff_size); -XBT_PUBLIC(smx_action_t) SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(smx_synchro_t) SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); XBT_PUBLIC(int) SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); XBT_PUBLIC(int) SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); -XBT_PUBLIC(void) SIMIX_comm_finish(smx_action_t action); +XBT_PUBLIC(void) SIMIX_comm_finish(smx_synchro_t synchro); /******************************************************************************/ /* SIMIX simcalls */ @@ -316,24 +320,24 @@ XBT_PUBLIC(int) simcall_host_get_nb_pstates(smx_host_t host); XBT_PUBLIC(void) simcall_host_set_power_peak_at(smx_host_t host, int pstate_index); XBT_PUBLIC(double) simcall_host_get_consumed_energy(smx_host_t host); -XBT_PUBLIC(smx_action_t) simcall_host_execute(const char *name, smx_host_t host, - double computation_amount, +XBT_PUBLIC(smx_synchro_t) simcall_host_execute(const char *name, smx_host_t host, + double flops_amount, double priority, double bound, unsigned long affinity_mask); -XBT_PUBLIC(smx_action_t) simcall_host_parallel_execute(const char *name, +XBT_PUBLIC(smx_synchro_t) simcall_host_parallel_execute(const char *name, int host_nb, smx_host_t *host_list, - double *computation_amount, - double *communication_amount, + double *flops_amount, + double *bytes_amount, double amount, double rate); -XBT_PUBLIC(void) simcall_host_execution_destroy(smx_action_t execution); -XBT_PUBLIC(void) simcall_host_execution_cancel(smx_action_t execution); -XBT_PUBLIC(double) simcall_host_execution_get_remains(smx_action_t execution); -XBT_PUBLIC(e_smx_state_t) simcall_host_execution_get_state(smx_action_t execution); -XBT_PUBLIC(void) simcall_host_execution_set_priority(smx_action_t execution, double priority); -XBT_PUBLIC(void) simcall_host_execution_set_bound(smx_action_t execution, double bound); -XBT_PUBLIC(void) simcall_host_execution_set_affinity(smx_action_t execution, smx_host_t host, unsigned long mask); -XBT_PUBLIC(e_smx_state_t) simcall_host_execution_wait(smx_action_t execution); +XBT_PUBLIC(void) simcall_host_execution_destroy(smx_synchro_t execution); +XBT_PUBLIC(void) simcall_host_execution_cancel(smx_synchro_t execution); +XBT_PUBLIC(double) simcall_host_execution_get_remains(smx_synchro_t execution); +XBT_PUBLIC(e_smx_state_t) simcall_host_execution_get_state(smx_synchro_t execution); +XBT_PUBLIC(void) simcall_host_execution_set_priority(smx_synchro_t execution, double priority); +XBT_PUBLIC(void) simcall_host_execution_set_bound(smx_synchro_t execution, double bound); +XBT_PUBLIC(void) simcall_host_execution_set_affinity(smx_synchro_t execution, smx_host_t host, unsigned long mask); +XBT_PUBLIC(e_smx_state_t) simcall_host_execution_wait(smx_synchro_t execution); XBT_PUBLIC(xbt_dict_t) simcall_host_get_mounted_storage_list(smx_host_t host); XBT_PUBLIC(xbt_dynar_t) simcall_host_get_attached_storage_list(smx_host_t host); XBT_PUBLIC(void) simcall_host_get_params(smx_host_t vm, ws_params_t param); @@ -369,6 +373,8 @@ XBT_PUBLIC(void) simcall_process_create(smx_process_t *process, XBT_PUBLIC(void) simcall_process_kill(smx_process_t process); XBT_PUBLIC(void) simcall_process_killall(int reset_pid); +XBT_PUBLIC(void) SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, const char *msg); + /* Process handling */ XBT_PUBLIC(void) simcall_process_cleanup(smx_process_t process); @@ -388,9 +394,10 @@ XBT_PUBLIC(int) simcall_process_get_PPID(smx_process_t process); XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process); XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host); XBT_PUBLIC(void) simcall_process_set_kill_time(smx_process_t process, double kill_time); -XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data); +XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data); XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart); XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process); +XBT_PUBLIC(void) simcall_process_join(smx_process_t process, double timeout); /* Sleep control */ XBT_PUBLIC(e_smx_state_t) simcall_process_sleep(double duration); @@ -401,7 +408,7 @@ XBT_PUBLIC(smx_rdv_t) simcall_rdv_create(const char *name); XBT_PUBLIC(void) simcall_rdv_destroy(smx_rdv_t rvp); XBT_PUBLIC(smx_rdv_t) simcall_rdv_get_by_name(const char *name); XBT_PUBLIC(int) simcall_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host); -XBT_PUBLIC(smx_action_t) simcall_rdv_get_head(smx_rdv_t rdv); +XBT_PUBLIC(smx_synchro_t) simcall_rdv_get_head(smx_rdv_t rdv); XBT_PUBLIC(smx_process_t) simcall_rdv_get_receiver(smx_rdv_t rdv); XBT_PUBLIC(void) simcall_rdv_set_receiver(smx_rdv_t rdv , smx_process_t process); @@ -409,58 +416,60 @@ XBT_PUBLIC(xbt_dict_t) SIMIX_get_rdv_points(void); /***** Communication simcalls *****/ -XBT_PUBLIC(void) simcall_comm_send(smx_rdv_t rdv, double task_size, +XBT_PUBLIC(void) simcall_comm_send(smx_process_t src, smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *, smx_action_t), + int (*match_fun)(void *, void *, smx_synchro_t), + void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double timeout); -XBT_PUBLIC(smx_action_t) simcall_comm_isend(smx_rdv_t rdv, double task_size, +XBT_PUBLIC(smx_synchro_t) simcall_comm_isend(smx_process_t src, smx_rdv_t rdv, + double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *, smx_action_t), + int (*match_fun)(void *, void *, smx_synchro_t), void (*clean_fun)(void *), + void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, int detached); XBT_PUBLIC(void) simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), + int (*match_fun)(void *, void *, smx_synchro_t), + void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double timeout, double rate); -XBT_PUBLIC(smx_action_t) simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, +XBT_PUBLIC(smx_synchro_t) simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, - int (*match_fun)(void *, void *, smx_action_t), + int (*match_fun)(void *, void *, smx_synchro_t), + void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data, double rate); -XBT_PUBLIC(smx_action_t) simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag, - int (*match_fun)(void *, void *, smx_action_t), void *data); -XBT_PUBLIC(void) simcall_comm_cancel(smx_action_t comm); +XBT_PUBLIC(smx_synchro_t) simcall_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag, + int (*match_fun)(void *, void *, smx_synchro_t), void *data); +XBT_PUBLIC(void) simcall_comm_cancel(smx_synchro_t comm); /* FIXME: waitany is going to be a vararg function, and should take a timeout */ XBT_PUBLIC(unsigned int) simcall_comm_waitany(xbt_dynar_t comms); -XBT_PUBLIC(void) simcall_comm_wait(smx_action_t comm, double timeout); -XBT_PUBLIC(int) simcall_comm_test(smx_action_t comm); +XBT_PUBLIC(void) simcall_comm_wait(smx_synchro_t comm, double timeout); +XBT_PUBLIC(int) simcall_comm_test(smx_synchro_t comm); XBT_PUBLIC(int) simcall_comm_testany(xbt_dynar_t comms); /* Getters and setters */ -XBT_PUBLIC(double) simcall_comm_get_remains(smx_action_t comm); -XBT_PUBLIC(e_smx_state_t) simcall_comm_get_state(smx_action_t comm); -XBT_PUBLIC(void *) simcall_comm_get_src_data(smx_action_t comm); -XBT_PUBLIC(void *) simcall_comm_get_dst_data(smx_action_t comm); -XBT_PUBLIC(smx_process_t) simcall_comm_get_src_proc(smx_action_t comm); -XBT_PUBLIC(smx_process_t) simcall_comm_get_dst_proc(smx_action_t comm); +XBT_PUBLIC(double) simcall_comm_get_remains(smx_synchro_t comm); +XBT_PUBLIC(e_smx_state_t) simcall_comm_get_state(smx_synchro_t comm); +XBT_PUBLIC(void *) simcall_comm_get_src_data(smx_synchro_t comm); +XBT_PUBLIC(void *) simcall_comm_get_dst_data(smx_synchro_t comm); +XBT_PUBLIC(smx_process_t) simcall_comm_get_src_proc(smx_synchro_t comm); +XBT_PUBLIC(smx_process_t) simcall_comm_get_dst_proc(smx_synchro_t comm); #ifdef HAVE_LATENCY_BOUND_TRACKING -XBT_PUBLIC(int) simcall_comm_is_latency_bounded(smx_action_t comm); +XBT_PUBLIC(int) simcall_comm_is_latency_bounded(smx_synchro_t comm); #endif -#ifdef HAVE_TRACING /************************** Tracing handling **********************************/ -XBT_PUBLIC(void) simcall_set_category(smx_action_t action, const char *category); -#endif +XBT_PUBLIC(void) simcall_set_category(smx_synchro_t synchro, const char *category); /************************** Synchro simcalls **********************************/ - XBT_PUBLIC(smx_mutex_t) simcall_mutex_init(void); XBT_PUBLIC(void) simcall_mutex_destroy(smx_mutex_t mutex); XBT_PUBLIC(void) simcall_mutex_lock(smx_mutex_t mutex); @@ -488,19 +497,19 @@ XBT_PUBLIC(int) simcall_sem_get_capacity(smx_sem_t sem); /***************************** File **********************************/ XBT_PUBLIC(void *) simcall_file_get_data(smx_file_t fd); XBT_PUBLIC(void) simcall_file_set_data(smx_file_t fd, void *data); -XBT_PUBLIC(sg_size_t) simcall_file_read(smx_file_t fd, sg_size_t size); -XBT_PUBLIC(sg_size_t) simcall_file_write(smx_file_t fd, sg_size_t size); -XBT_PUBLIC(smx_file_t) simcall_file_open(const char* storage, const char* path); -XBT_PUBLIC(int) simcall_file_close(smx_file_t fd); -XBT_PUBLIC(int) simcall_file_unlink(smx_file_t fd); -XBT_PUBLIC(xbt_dict_t) simcall_file_ls(const char* mount, const char* path); +XBT_PUBLIC(sg_size_t) simcall_file_read(smx_file_t fd, sg_size_t size, smx_host_t host); +XBT_PUBLIC(sg_size_t) simcall_file_write(smx_file_t fd, sg_size_t size, smx_host_t host); +XBT_PUBLIC(smx_file_t) simcall_file_open(const char* fullpath, smx_host_t host); +XBT_PUBLIC(int) simcall_file_close(smx_file_t fd, smx_host_t host); +XBT_PUBLIC(int) simcall_file_unlink(smx_file_t fd, smx_host_t host); XBT_PUBLIC(sg_size_t) simcall_file_get_size(smx_file_t fd); XBT_PUBLIC(xbt_dynar_t) simcall_file_get_info(smx_file_t fd); XBT_PUBLIC(sg_size_t) simcall_file_tell(smx_file_t fd); -XBT_PUBLIC(int) simcall_file_seek(smx_file_t fd, sg_size_t offset, int origin); +XBT_PUBLIC(int) simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin); +XBT_PUBLIC(int) simcall_file_move(smx_file_t fd, const char* fullpath); /***************************** Storage **********************************/ -XBT_PUBLIC(sg_size_t) simcall_storage_get_free_size (const char* name); -XBT_PUBLIC(sg_size_t) simcall_storage_get_used_size (const char* name); +XBT_PUBLIC(sg_size_t) simcall_storage_get_free_size (smx_storage_t storage); +XBT_PUBLIC(sg_size_t) simcall_storage_get_used_size (smx_storage_t storage); XBT_PUBLIC(xbt_dict_t) simcall_storage_get_properties(smx_storage_t storage); XBT_PUBLIC(void*) SIMIX_storage_get_data(smx_storage_t storage); XBT_PUBLIC(void) SIMIX_storage_set_data(smx_storage_t storage, void *data); @@ -508,7 +517,6 @@ XBT_PUBLIC(xbt_dict_t) SIMIX_storage_get_content(smx_storage_t storage); XBT_PUBLIC(xbt_dict_t) simcall_storage_get_content(smx_storage_t storage); XBT_PUBLIC(const char*) SIMIX_storage_get_name(smx_storage_t storage); XBT_PUBLIC(sg_size_t) SIMIX_storage_get_size(smx_storage_t storage); -XBT_PUBLIC(void) simcall_storage_file_rename(smx_storage_t storage, const char* src, const char* dest); XBT_PUBLIC(const char*) SIMIX_storage_get_host(smx_storage_t storage); /************************** AS router **********************************/ XBT_PUBLIC(xbt_dict_t) SIMIX_asr_get_properties(const char *name); @@ -520,10 +528,5 @@ XBT_PUBLIC(void *) simcall_mc_snapshot(void); XBT_PUBLIC(int) simcall_mc_compare_snapshots(void *s1, void *s2); XBT_PUBLIC(int) simcall_mc_random(int min, int max); -/************************** New API simcalls **********************************/ -/* TUTORIAL: New API */ -/******************************************************************************/ -XBT_PUBLIC(int) simcall_new_api_fct(const char* param1, double param2); - SG_END_DECL() #endif /* _SIMIX_SIMIX_H */