X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74a527bf6a03467a14add202f92745a50d876ed7..047845aeddd920d5976b792dac5516cf3e5707c8:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index 07dcf2c527..dfdb2a499e 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -12,8 +12,27 @@ #include "msg/datatypes.h" #include "xbt/automaton.h" +#include "simgrid/simix.h" + SG_BEGIN_DECL() +/** @brief Return code of most MSG functions + @ingroup msg_simulation + @{ */ +/* Keep these code as binary values: java bindings manipulate | of these values */ +typedef enum { + MSG_OK = 0, /**< @brief Everything is right. Keep on going this way ! */ + MSG_TIMEOUT = 1, /**< @brief nothing good happened before the timer you provided elapsed */ + MSG_TRANSFER_FAILURE = 2, /**< @brief There has been a problem during you task + transfer. Either the network is down or the remote host has been + shutdown. */ + MSG_HOST_FAILURE = 4, /**< @brief System shutdown. The host on which you are + running has just been rebooted. Free your datastructures and + return now !*/ + MSG_TASK_CANCELED = 8 /**< @brief Canceled task. This task has been canceled by somebody!*/ +} MSG_error_t; +/** @} */ + /************************** Global ******************************************/ XBT_PUBLIC(void) MSG_config(const char *name, ...); @@ -38,11 +57,11 @@ XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(void); /************************** File handling ***********************************/ -XBT_PUBLIC(size_t) MSG_file_read(void* ptr, size_t size, size_t nmemb, m_file_t stream); -XBT_PUBLIC(size_t) MSG_file_write(const void* ptr, size_t size, size_t nmemb, m_file_t stream); -XBT_PUBLIC(m_file_t) MSG_file_open(const char* path, const char* mode); -XBT_PUBLIC(int) MSG_file_close(m_file_t fp); -XBT_PUBLIC(int) MSG_file_stat(int fd, void* buf); +XBT_PUBLIC(size_t) MSG_file_read(const char* storage, void* ptr, size_t size, size_t nmemb, msg_file_t stream); +XBT_PUBLIC(size_t) MSG_file_write(const char* storage, const void* ptr, size_t size, size_t nmemb, msg_file_t stream); +XBT_PUBLIC(msg_file_t) MSG_file_open(const char* storage, const char* path, const char* mode); +XBT_PUBLIC(int) MSG_file_close(const char* storage, msg_file_t fp); +XBT_PUBLIC(int) MSG_file_stat(const char* storage, msg_file_t fd, s_msg_stat_t *buf); /************************** Host handling ***********************************/ @@ -65,8 +84,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, @@ -105,6 +123,8 @@ 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); +XBT_PUBLIC(MSG_error_t) MSG_process_set_kill_time(m_process_t process, double kill_time); /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(m_process_t process); @@ -120,6 +140,10 @@ XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process); 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, @@ -137,7 +161,7 @@ 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); -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_execute(m_task_t task); @@ -170,7 +194,7 @@ XBT_PUBLIC(MSG_error_t) XBT_PUBLIC(msg_comm_t) MSG_task_isend(m_task_t task, const char *alias); XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task, const char *alias, - int (*match_fun)(void*,void*), + int (*match_fun)(void*,void*, smx_action_t), void *match_data); XBT_PUBLIC(void) MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup); @@ -202,6 +226,9 @@ XBT_PUBLIC(MSG_error_t) XBT_PUBLIC(int) MSG_task_listen_from(const char *alias); +XBT_PUBLIC(void) MSG_task_set_category (m_task_t task, const char *category); +XBT_PUBLIC(const char *) MSG_task_get_category (m_task_t task); + /************************** Task handling ************************************/ XBT_PUBLIC(MSG_error_t) MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task, @@ -220,6 +247,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) \ @@ -258,7 +288,6 @@ XBT_PUBLIC(int) MSG_get_channel_number(void); #include "instr/instr.h" /* Used only by the bindings */ -#include "simix/simix.h" XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(m_process_t process); SG_END_DECL()