X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/071079858329b6eaa616f1fc2c0b12a441973e17..dae1dd8653d74810b1dce5ea941f2e4d214827d9:/src/msg/msg_mailbox.cpp

diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp
index 007284d20f..74d330d84e 100644
--- a/src/msg/msg_mailbox.cpp
+++ b/src/msg/msg_mailbox.cpp
@@ -9,8 +9,7 @@
 #include "simgrid/msg.h"
 #include "msg_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
-                                "Logging specific to MSG (mailbox)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");
 
 msg_mailbox_t MSG_mailbox_new(const char *alias)
 {
@@ -37,16 +36,13 @@ msg_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
   return (msg_task_t) simcall_comm_get_src_data(comm);
 }
 
-int
-MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
-                                         msg_host_t host)
+int MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox, msg_host_t host)
 {
   return simcall_rdv_comm_count_by_host(mailbox, host);
 }
 
 msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
 {
-
   msg_mailbox_t mailbox = simcall_rdv_get_by_name(alias);
 
   if (!mailbox)
@@ -58,11 +54,9 @@ msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
 /** \ingroup msg_mailbox_management
  * \brief Set the mailbox to receive in asynchronous mode
  *
- * All messages sent to this mailbox will be transferred to
- * the receiver without waiting for the receive call.
+ * All messages sent to this mailbox will be transferred to the receiver without waiting for the receive call.
  * The receive call will still be necessary to use the received data.
- * If there is a need to receive some messages asynchronously, and some not,
- * two different mailboxes should be used.
+ * If there is a need to receive some messages asynchronously, and some not, two different mailboxes should be used.
  *
  * \param alias The name of the mailbox
  */
@@ -71,7 +65,6 @@ void MSG_mailbox_set_async(const char *alias){
 
   simcall_rdv_set_receiver(mailbox, SIMIX_process_self());
   XBT_VERB("%s mailbox set to receive eagerly for process %p\n",alias, SIMIX_process_self());
-
 }
 
 /** \ingroup msg_mailbox_management
@@ -86,9 +79,7 @@ void MSG_mailbox_set_async(const char *alias){
  * #MSG_OK if the task was successfully received,
  * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise.
  */
-msg_error_t
-MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t *task,
-                         msg_host_t host, double timeout)
+msg_error_t MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t *task, msg_host_t host, double timeout)
 {
   return MSG_mailbox_get_task_ext_bounded(mailbox, task, host, timeout, -1.0);
 }
@@ -106,9 +97,8 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t *task,
  * #MSG_OK if the task was successfully received,
  * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise.
  */
-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)
+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)
 {
   xbt_ex_t e;
   msg_error_t ret = MSG_OK;
@@ -123,8 +113,7 @@ MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t * task,
   xbt_assert(task, "Null pointer for the task storage");
 
   if (*task)
-    XBT_WARN
-        ("Asked to write the received task in a non empty struct -- proceeding.");
+    XBT_WARN("Asked to write the received task in a non empty struct -- proceeding.");
 
   /* Try to receive it by calling SIMIX network layer */
   TRY {
@@ -154,17 +143,13 @@ MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t * task,
     xbt_ex_free(e);
   }
 
-  if (ret != MSG_HOST_FAILURE &&
-      ret != MSG_TRANSFER_FAILURE &&
-      ret != MSG_TIMEOUT) {
+  if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
     TRACE_msg_task_get_end(start_time, *task);
   }
   MSG_RETURN(ret);
 }
 
-msg_error_t
-MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
-                             double timeout)
+msg_error_t MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task, double timeout)
 {
   msg_error_t ret = MSG_OK;
   simdata_task_t t_simdata = NULL;
@@ -186,7 +171,8 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
       xbt_backtrace_display_current();
     } else {
       xbt_assert(t_simdata->isused == 0,
-                 "This task is still being used somewhere else. You cannot send it now. Go fix your code! (use --cfg=msg/debug_multiple_use:on to get the backtrace of the other process)");
+                 "This task is still being used somewhere else. You cannot send it now. Go fix your code!"
+                 " (use --cfg=msg/debug_multiple_use:on to get the backtrace of the other process)");
     }
   }
 
@@ -197,7 +183,6 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
   t_simdata->comm = NULL;
   msg_global->sent_msg++;
 
-
   p_simdata->waiting_task = task;
 
   xbt_ex_t e;
@@ -205,8 +190,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
   TRY {
     smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call  */
     comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount,
-                                  t_simdata->rate, task, sizeof(void *),
-                                  NULL, NULL, NULL, task, 0);
+                              t_simdata->rate, task, sizeof(void *), NULL, NULL, NULL, task, 0);
     if (TRACE_is_enabled())
       simcall_set_category(comm, task->category);
      t_simdata->comm = comm;
@@ -235,10 +219,8 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
     t_simdata->isused = 0;
   }
 
-
   p_simdata->waiting_task = NULL;
   if (call_end)
     TRACE_msg_task_put_end();
   MSG_RETURN(ret);
 }
-