X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c912b7d6e75473bd05731ccf77f3e2d82afb7802..1237a73925dd28b706282baeca1379d187ef8795:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index f30a1d1ce7..eed0d313c5 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -19,12 +19,9 @@ SG_BEGIN_DECL() XBT_PUBLIC(void) MSG_config(const char *name, ...); XBT_PUBLIC(void) MSG_global_init(int *argc, char **argv); XBT_PUBLIC(void) MSG_global_init_args(int *argc, char **argv); -XBT_PUBLIC(MSG_error_t) MSG_set_channel_number(int number); -XBT_PUBLIC(int) MSG_get_channel_number(void); XBT_PUBLIC(MSG_error_t) MSG_main(void); XBT_PUBLIC(MSG_error_t) MSG_main_stateful(void); -XBT_PUBLIC(MSG_error_t) MSG_main_liveness_stateful(xbt_automaton_t a); -XBT_PUBLIC(MSG_error_t) MSG_main_liveness_stateless(xbt_automaton_t a, char *prgm); +XBT_PUBLIC(MSG_error_t) MSG_main_liveness(xbt_automaton_t a, char *prgm); XBT_PUBLIC(MSG_error_t) MSG_clean(void); XBT_PUBLIC(void) MSG_function_register(const char *name, xbt_main_func_t code); @@ -40,6 +37,14 @@ XBT_PUBLIC(double) MSG_get_clock(void); XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void); +/************************** File handling ***********************************/ +XBT_PUBLIC(size_t) MSG_file_read(const char* storage, void* ptr, size_t size, size_t nmemb, m_file_t stream); +XBT_PUBLIC(size_t) MSG_file_write(const char* storage, const void* ptr, size_t size, size_t nmemb, m_file_t stream); +XBT_PUBLIC(m_file_t) MSG_file_open(const char* storage, const char* path, const char* mode); +XBT_PUBLIC(int) MSG_file_close(const char* storage, m_file_t fp); +XBT_PUBLIC(int) MSG_file_stat(const char* storage, int fd, void* buf); + + /************************** Host handling ***********************************/ XBT_PUBLIC(MSG_error_t) MSG_host_set_data(m_host_t host, void *data); XBT_PUBLIC(void *) MSG_host_get_data(m_host_t host); @@ -60,8 +65,7 @@ XBT_PUBLIC(void) MSG_create_environment(const char *file); XBT_PUBLIC(void) MSG_load_platform_script(const char *script_file); XBT_PUBLIC(m_host_t) MSG_get_host_by_name(const char *name); -XBT_PUBLIC(int) MSG_get_host_number(void); -XBT_PUBLIC(m_host_t *) MSG_get_host_table(void); +XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(void); /************************** Process handling *********************************/ XBT_PUBLIC(m_process_t) MSG_process_create(const char *name, @@ -91,6 +95,7 @@ XBT_PUBLIC(MSG_error_t) MSG_process_migrate(m_process_t process, m_host_t host); XBT_PUBLIC(void *) MSG_process_get_data(m_process_t process); XBT_PUBLIC(MSG_error_t) MSG_process_set_data(m_process_t process, void *data); +XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup); XBT_PUBLIC(m_host_t) MSG_process_get_host(m_process_t process); XBT_PUBLIC(m_process_t) MSG_process_from_PID(int PID); XBT_PUBLIC(int) MSG_process_get_PID(m_process_t process); @@ -99,6 +104,7 @@ XBT_PUBLIC(const char *) MSG_process_get_name(m_process_t process); XBT_PUBLIC(int) MSG_process_self_PID(void); XBT_PUBLIC(int) MSG_process_self_PPID(void); XBT_PUBLIC(m_process_t) MSG_process_self(void); +XBT_PUBLIC(xbt_dynar_t) MSG_processes_as_dynar(void); /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(m_process_t process); @@ -111,10 +117,13 @@ XBT_PUBLIC(MSG_error_t) MSG_process_resume(m_process_t process); XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process); /************************** Task handling ************************************/ - XBT_PUBLIC(m_task_t) MSG_task_create(const char *name, double compute_duration, double message_size, void *data); +XBT_PUBLIC(m_gpu_task_t) MSG_gpu_task_create(const char *name, + double compute_duration, + double dispatch_latency, + double collect_latency); XBT_PUBLIC(m_task_t) MSG_parallel_task_create(const char *name, int host_nb, const m_host_t * host_list, @@ -123,6 +132,8 @@ XBT_PUBLIC(m_task_t) MSG_parallel_task_create(const char *name, void *data); XBT_PUBLIC(void *) MSG_task_get_data(m_task_t task); XBT_PUBLIC(void) MSG_task_set_data(m_task_t task, void *data); +XBT_PUBLIC(void) MSG_task_set_copy_callback(void (*callback) ( + m_task_t task, m_process_t src, m_process_t dst)); XBT_PUBLIC(m_process_t) MSG_task_get_sender(m_task_t task); XBT_PUBLIC(m_host_t) MSG_task_get_source(m_task_t task); XBT_PUBLIC(const char *) MSG_task_get_name(m_task_t task); @@ -130,36 +141,13 @@ XBT_PUBLIC(void) MSG_task_set_name(m_task_t task, const char *name); XBT_PUBLIC(MSG_error_t) MSG_task_cancel(m_task_t task); XBT_PUBLIC(MSG_error_t) MSG_task_destroy(m_task_t task); -XBT_PUBLIC(MSG_error_t) MSG_task_get(m_task_t * task, m_channel_t channel); -XBT_PUBLIC(MSG_error_t) MSG_task_get_with_timeout(m_task_t * task, - m_channel_t channel, - double max_duration); -XBT_PUBLIC(MSG_error_t) MSG_task_get_from_host(m_task_t * task, - int channel, m_host_t host); -MSG_error_t MSG_task_receive_from_host(m_task_t * task, const char *alias, +XBT_PUBLIC(MSG_error_t) MSG_task_receive_from_host(m_task_t * task, const char *alias, m_host_t host); -XBT_PUBLIC(MSG_error_t) MSG_task_get_ext(m_task_t * task, int channel, - double max_duration, - m_host_t host); - -XBT_PUBLIC(MSG_error_t) MSG_task_put(m_task_t task, m_host_t dest, - m_channel_t channel); -XBT_PUBLIC(MSG_error_t) MSG_task_put_bounded(m_task_t task, - m_host_t dest, - m_channel_t channel, - double max_rate); -XBT_PUBLIC(MSG_error_t) MSG_task_put_with_timeout(m_task_t task, - m_host_t dest, - m_channel_t channel, - double max_duration); XBT_PUBLIC(MSG_error_t) MSG_task_execute(m_task_t task); XBT_PUBLIC(MSG_error_t) MSG_parallel_task_execute(m_task_t task); XBT_PUBLIC(void) MSG_task_set_priority(m_task_t task, double priority); -XBT_PUBLIC(int) MSG_task_Iprobe(m_channel_t channel); -XBT_PUBLIC(int) MSG_task_probe_from(m_channel_t channel); -XBT_PUBLIC(int) MSG_task_probe_from_host(int channel, m_host_t host); XBT_PUBLIC(MSG_error_t) MSG_process_sleep(double nb_sec); XBT_PUBLIC(double) MSG_task_get_compute_duration(m_task_t task); @@ -184,9 +172,10 @@ XBT_PUBLIC(MSG_error_t) #define MSG_task_recv(t,a) MSG_task_receive(t,a) XBT_PUBLIC(msg_comm_t) MSG_task_isend(m_task_t task, const char *alias); -XBT_INLINE XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task, const char *alias, - int (*match_fun)(void*,void*), - void *match_data); +XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task, + const char *alias, + int (*match_fun)(void*,void*), + void *match_data); XBT_PUBLIC(void) MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup); XBT_PUBLIC(msg_comm_t) MSG_task_irecv(m_task_t * task, const char *alias); @@ -235,6 +224,9 @@ MSG_error_t MSG_action_trace_run(char *path); #ifdef MSG_USE_DEPRECATED /* these are the functions which are deprecated. Do not use them, they may get removed in future releases */ +XBT_PUBLIC(int) MSG_get_host_number(void); +XBT_PUBLIC(m_host_t *) MSG_get_host_table(void); + #define MSG_TIMEOUT_FAILURE MSG_TIMEOUT #define MSG_TASK_CANCELLED MSG_TASK_CANCELED #define MSG_mailbox_put_with_time_out(mailbox, task, timeout) \ @@ -242,6 +234,32 @@ MSG_error_t MSG_action_trace_run(char *path); #define MSG_process_change_host(h) MSG_process_migrate(MSG_process_self(),h); XBT_PUBLIC(MSG_error_t) MSG_get_errno(void); + +XBT_PUBLIC(MSG_error_t) MSG_task_get(m_task_t * task, m_channel_t channel); +XBT_PUBLIC(MSG_error_t) MSG_task_get_with_timeout(m_task_t * task, + m_channel_t channel, + double max_duration); +XBT_PUBLIC(MSG_error_t) MSG_task_get_from_host(m_task_t * task, + int channel, m_host_t host); +XBT_PUBLIC(MSG_error_t) MSG_task_get_ext(m_task_t * task, int channel, + double max_duration, + m_host_t host); +XBT_PUBLIC(MSG_error_t) MSG_task_put(m_task_t task, m_host_t dest, + m_channel_t channel); +XBT_PUBLIC(MSG_error_t) MSG_task_put_bounded(m_task_t task, + m_host_t dest, + m_channel_t channel, + double max_rate); +XBT_PUBLIC(MSG_error_t) MSG_task_put_with_timeout(m_task_t task, + m_host_t dest, + m_channel_t channel, + double max_duration); +XBT_PUBLIC(int) MSG_task_Iprobe(m_channel_t channel); +XBT_PUBLIC(int) MSG_task_probe_from(m_channel_t channel); +XBT_PUBLIC(int) MSG_task_probe_from_host(int channel, m_host_t host); + +XBT_PUBLIC(MSG_error_t) MSG_set_channel_number(int number); +XBT_PUBLIC(int) MSG_get_channel_number(void); #endif #include "instr/instr.h"