X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64ea8dcf1daac53da58d65aa91b7452aae8b13b7..c52c503d21e54cc4ff15a64060c2eb0b265f5f73:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 27594822dd..f66a3377ea 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -14,21 +14,7 @@ SG_BEGIN_DECL() -/* ******************************** Mailbox ************************************ */ - -/** @brief Mailbox datatype - * @ingroup msg_task_usage - * - * Object representing a communication rendez-vous point, on which - * the sender finds the receiver it wants to communicate with. As a - * MSG user, you will only rarely manipulate any of these objects - * directly, since most of the public interface (such as - * #MSG_task_send and friends) hide this object behind a string - * alias. That mean that you don't provide the mailbox on which you - * want to send your task, but only the name of this mailbox. */ -typedef struct s_smx_mailbox *msg_mailbox_t; - -/* ******************************** Environment ************************************ */ +/* ************************* Autonomous System ****************************** */ typedef simgrid_As *msg_as_t; /* ******************************** Host ************************************ */ @@ -55,6 +41,8 @@ typedef struct s_msg_host_priv { xbt_dynar_t file_descriptor_table; } s_msg_host_priv_t; +XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors; + /* ******************************** Task ************************************ */ typedef struct simdata_task *simdata_task_t; @@ -197,7 +185,6 @@ XBT_PUBLIC(msg_error_t) MSG_main(void); XBT_PUBLIC(void) MSG_function_register(const char *name, xbt_main_func_t code); XBT_PUBLIC(void) MSG_function_register_default(xbt_main_func_t code); -XBT_PUBLIC(xbt_main_func_t) MSG_get_registered_function(const char *name); XBT_PUBLIC(void) MSG_launch_application(const char *file); /*Bypass the parser */ XBT_PUBLIC(void) MSG_set_function(const char *host_id, @@ -450,27 +437,6 @@ XBT_PUBLIC(void) MSG_task_set_category (msg_task_t task, const char *category); XBT_PUBLIC(const char *) MSG_task_get_category (msg_task_t task); /************************** Mailbox handling ************************************/ -/* @brief MSG_mailbox_new - create a new mailbox. - * Creates a new mailbox identified by the key specified by the parameter alias and add it in the global dictionary. - * @param alias The alias of the mailbox to create. - * @return The newly created mailbox. - */ -XBT_PUBLIC(msg_mailbox_t) MSG_mailbox_new(const char *alias); - -/* @brief MSG_mailbox_get_by_alias - get a mailbox from its alias. - * Returns the mailbox associated with the key specified by the parameter alias. If the mailbox does not exists, - * the function creates it. - * @param alias The alias of the mailbox to return. - * @return The mailbox associated with the alias specified as parameter or a new one if the key doesn't match. - */ -XBT_PUBLIC(msg_mailbox_t) MSG_mailbox_get_by_alias(const char *alias); - -/* @brief MSG_mailbox_is_empty - test if a mailbox is empty. - * Tests if a mailbox is empty (contains no msg task). - * @param mailbox The mailbox to get test. - * @return 1 if the mailbox is empty, 0 otherwise. - */ -XBT_PUBLIC(int) MSG_mailbox_is_empty(msg_mailbox_t mailbox); /* @brief MSG_mailbox_set_async - set a mailbox as eager * Sets the mailbox to a permanent receiver mode. Messages sent to this mailbox will then be sent just after the send @@ -480,18 +446,6 @@ XBT_PUBLIC(int) MSG_mailbox_is_empty(msg_mailbox_t mailbox); */ XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias); -/* @brief MSG_mailbox_get_head - get the task at the head of a mailbox. - * Returns the task at the head of the mailbox. This function does not remove the task from the mailbox. - * @param mailbox The mailbox concerned by the operation. - * @return The task at the head of the mailbox. - */ -XBT_PUBLIC(msg_task_t) MSG_mailbox_front(msg_mailbox_t mailbox); - -XBT_PUBLIC(msg_error_t) MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t * task, msg_host_t host, - double timeout); -XBT_PUBLIC(msg_error_t) MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *task, msg_host_t host, - double timeout, double rate); - /************************** Action handling **********************************/ XBT_PUBLIC(msg_error_t) MSG_action_trace_run(char *path); XBT_PUBLIC(void) MSG_action_init(void); @@ -506,7 +460,7 @@ XBT_PUBLIC(msg_sem_t) MSG_sem_init(int initial_value); XBT_PUBLIC(void) MSG_sem_acquire(msg_sem_t sem); XBT_PUBLIC(msg_error_t) MSG_sem_acquire_timeout(msg_sem_t sem, double timeout); XBT_PUBLIC(void) MSG_sem_release(msg_sem_t sem); -XBT_PUBLIC(void) MSG_sem_get_capacity(msg_sem_t sem); +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);