X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e05361c201fb95d2b7605e59001cd0a49a489739..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 6e808b503a..154c19510d 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -7,16 +7,24 @@ #define SIMGRID_MSG_H #include +#include +#include #include #include #include +#include #include #include #include #include -#include -#include -#include +#include + +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif #ifdef __cplusplus #include @@ -122,6 +130,7 @@ typedef sg_actor_t msg_process_t; XBT_PUBLIC int MSG_process_get_PID(msg_process_t process); XBT_PUBLIC int MSG_process_get_PPID(msg_process_t process); +XBT_PUBLIC sg_actor_t MSG_process_from_PID(int pid); XBT_PUBLIC const char* MSG_process_get_name(msg_process_t process); XBT_PUBLIC sg_host_t MSG_process_get_host(msg_process_t process); @@ -133,21 +142,21 @@ XBT_PUBLIC void MSG_process_suspend(msg_process_t process); XBT_PUBLIC void MSG_process_resume(msg_process_t process); XBT_PUBLIC int MSG_process_is_suspended(msg_process_t process); XBT_PUBLIC void MSG_process_restart(msg_process_t process); +XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_restart); XBT_PUBLIC void MSG_process_daemonize(msg_process_t process); XBT_PUBLIC void MSG_process_migrate(msg_process_t process, msg_host_t host); XBT_PUBLIC void MSG_process_join(msg_process_t process, double timeout); XBT_PUBLIC void MSG_process_kill(msg_process_t process); +XBT_PUBLIC void MSG_process_killall(); XBT_PUBLIC void MSG_process_set_kill_time(msg_process_t process, double kill_time); - -/* ******************************** File ************************************ */ -typedef sg_file_t msg_file_t; -XBT_PUBLIC_DATA int sg_storage_max_file_descriptors; +XBT_PUBLIC void MSG_process_yield(); /** - * \brief @brief Communication action. - * \ingroup msg_task_usage + * @brief @brief Communication action. + * @ingroup msg_task_usage * - * Object representing an ongoing communication between processes. Such beast is usually obtained by using #MSG_task_isend, #MSG_task_irecv or friends. + * Object representing an ongoing communication between processes. Such beast is usually obtained by using + * #MSG_task_isend, #MSG_task_irecv or friends. */ typedef sg_msg_Comm* msg_comm_t; @@ -173,8 +182,8 @@ typedef struct msg_task { typedef struct msg_task* msg_task_t; -/** \brief Default value for an uninitialized #msg_task_t. - \ingroup m_task_management +/** @brief Default value for an uninitialized #msg_task_t. + @ingroup m_task_management */ #define MSG_TASK_UNINITIALIZED NULL @@ -197,9 +206,9 @@ typedef enum { /************************** Global ******************************************/ XBT_PUBLIC void MSG_config(const char* key, const char* value); -/** \ingroup msg_simulation - * \brief Initialize the MSG internal data. - * \hideinitializer +/** @ingroup msg_simulation + * @brief Initialize the MSG internal data. + * @hideinitializer * * It also check that the link-time and compile-time versions of SimGrid do * match, so you should use this version instead of the #MSG_init_nocheck @@ -207,9 +216,10 @@ XBT_PUBLIC void MSG_config(const char* key, const char* value); * * We allow to link against compiled versions that differ in the patch level. */ -#define MSG_init(argc,argv) do { \ - sg_version_check(SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);\ - MSG_init_nocheck(argc,argv); \ +#define MSG_init(argc, argv) \ + do { \ + sg_version_check(SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH); \ + MSG_init_nocheck(argc, argv); \ } while (0) XBT_PUBLIC void MSG_init_nocheck(int* argc, char** argv); @@ -235,11 +245,7 @@ XBT_PUBLIC msg_process_t MSG_process_create_with_environment(const char* name, x XBT_PUBLIC msg_process_t MSG_process_attach(const char* name, void* data, msg_host_t host, xbt_dict_t properties); XBT_PUBLIC void MSG_process_detach(); -XBT_PUBLIC int MSG_process_killall(); -XBT_PUBLIC void MSG_process_yield(); - XBT_PUBLIC void MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup); -XBT_PUBLIC msg_process_t MSG_process_from_PID(int PID); XBT_PUBLIC int MSG_process_self_PID(); XBT_PUBLIC int MSG_process_self_PPID(); XBT_PUBLIC const char* MSG_process_self_name(); @@ -251,7 +257,6 @@ XBT_PUBLIC void* MSG_process_get_data(msg_process_t process); XBT_PUBLIC msg_error_t MSG_process_set_data(msg_process_t process, void* data); XBT_PUBLIC void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void* data); -XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_restart); XBT_PUBLIC void MSG_process_ref(msg_process_t process); XBT_PUBLIC void MSG_process_unref(msg_process_t process); @@ -351,13 +356,7 @@ XBT_PUBLIC int MSG_sem_get_capacity(msg_sem_t sem); XBT_PUBLIC void MSG_sem_destroy(msg_sem_t sem); XBT_PUBLIC int MSG_sem_would_block(msg_sem_t sem); -/** @brief Opaque type representing a barrier identifier - * @ingroup msg_synchro - * @hideinitializer - */ - -#define MSG_BARRIER_SERIAL_PROCESS -1 -typedef struct s_msg_bar_t* msg_bar_t; +typedef sg_bar_t msg_bar_t; XBT_PUBLIC msg_bar_t MSG_barrier_init(unsigned int count); XBT_PUBLIC void MSG_barrier_destroy(msg_bar_t bar); XBT_PUBLIC int MSG_barrier_wait(msg_bar_t bar); @@ -371,9 +370,9 @@ MSG_process_get_smx_ctx(msg_process_t process); SG_END_DECL() #ifdef __cplusplus -XBT_PUBLIC msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, +XBT_PUBLIC msg_process_t MSG_process_create_from_stdfunc(std::string name, std::function code, void* data, msg_host_t host, - std::map* properties); + std::unordered_map* properties); #endif #endif