X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10cf427e20858a7365e1c28b693b93876f69026a..bf6a75d25c9f251b1c9b154272272cf990076431:/src/msg/msg_gos.c

diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c
index 2ad4301a7e..45e9dd460f 100644
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.c
@@ -27,7 +27,6 @@ MSG_error_t MSG_task_execute(m_task_t task)
   simdata_task_t simdata = NULL;
   simdata_process_t p_simdata;
   e_smx_state_t comp_state;
-  CHECK_HOST();
 
   simdata = task->simdata;
 
@@ -166,7 +165,6 @@ MSG_error_t MSG_parallel_task_execute(m_task_t task)
   simdata_task_t simdata = NULL;
   e_smx_state_t comp_state;
   simdata_process_t p_simdata;
-  CHECK_HOST();
 
   simdata = task->simdata;
   p_simdata = SIMIX_process_self_get_data(SIMIX_process_self());
@@ -382,8 +380,6 @@ XBT_INLINE msg_comm_t MSG_task_isend_with_matching(m_task_t task, const char *al
   m_process_t process = MSG_process_self();
   msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
 
-  CHECK_HOST();
-
   /* FIXME: these functions are not traceable */
 
   /* Prepare the task to send */
@@ -434,8 +430,6 @@ void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup)
   m_process_t process = MSG_process_self();
   msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
 
-  CHECK_HOST();
-
   /* FIXME: these functions are not traceable */
 
   /* Prepare the task to send */
@@ -470,8 +464,6 @@ msg_comm_t MSG_task_irecv(m_task_t *task, const char *name)
 {
   smx_rdv_t rdv = MSG_mailbox_get_by_alias(name);
 
-  CHECK_HOST();
-
   /* FIXME: these functions are not traceable */
 
   /* Sanity check */
@@ -842,8 +834,6 @@ MSG_task_send_with_timeout(m_task_t task, const char *alias,
  */
 int MSG_task_listen(const char *alias)
 {
-  CHECK_HOST();
-
   return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias));
 }
 
@@ -859,8 +849,6 @@ int MSG_task_listen(const char *alias)
  */
 int MSG_task_listen_from_host(const char *alias, m_host_t host)
 {
-  CHECK_HOST();
-
   return
       MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias
                                                (alias), host);
@@ -879,8 +867,6 @@ int MSG_task_listen_from(const char *alias)
 {
   m_task_t task;
 
-  CHECK_HOST();
-
   if (NULL ==
       (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias))))
     return -1;
@@ -888,8 +874,53 @@ int MSG_task_listen_from(const char *alias)
   return MSG_process_get_PID(task->simdata->sender);
 }
 
-#ifdef MSG_USE_DEPRECATED
 /** \ingroup msg_gos_functions
+ * \brief Sets the tracing category of a task.
+ *
+ * This function should be called after the creation of
+ * a MSG task, to define the category of that task. The
+ * first parameter task must contain a task that was
+ * created with the function #MSG_task_create. The second
+ * parameter category must contain a category that was
+ * previously declared with the function #TRACE_category
+ * (or with #TRACE_category_with_color).
+ *
+ * See \ref tracing_tracing for details on how to trace
+ * the (categorized) resource utilization.
+ *
+ * \param task the task that is going to be categorized
+ * \param category the name of the category to be associated to the task
+ *
+ * \see MSG_task_get_category, TRACE_category, TRACE_category_with_color
+ */
+void MSG_task_set_category (m_task_t task, const char *category)
+{
+#ifdef HAVE_TRACING
+  TRACE_msg_set_task_category (task, category);
+#endif
+}
+
+/** \ingroup msg_gos_functions
+ *
+ * \brief Gets the current tracing category of a task.
+ *
+ * \param task the task to be considered
+ *
+ * \see MSG_task_set_category
+ *
+ * \return Returns the name of the tracing category of the given task, NULL otherwise
+ */
+const char *MSG_task_get_category (m_task_t task)
+{
+#ifdef HAVE_TRACING
+  return task->category;
+#else
+  return NULL;
+#endif
+}
+
+#ifdef MSG_USE_DEPRECATED
+/** \ingroup msg_deprecated_functions
  *
  * \brief Return the last value returned by a MSG function (except
  * MSG_get_errno...).
@@ -899,7 +930,7 @@ MSG_error_t MSG_get_errno(void)
   return PROCESS_GET_ERRNO();
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
  * \brief Put a task on a channel of an host and waits for the end of the
  * transmission.
  *
@@ -930,7 +961,7 @@ MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel)
   return MSG_task_put_with_timeout(task, dest, channel, -1.0);
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
  * \brief Does exactly the same as MSG_task_put but with a bounded transmition
  * rate.
  *
@@ -945,7 +976,9 @@ MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel,
   return MSG_task_put(task, dest, channel);
 }
 
-/** \ingroup msg_gos_functions \brief Put a task on a channel of an
+/** \ingroup msg_deprecated_functions
+ *
+ * \brief Put a task on a channel of an
  * host (with a timeout on the waiting of the destination host) and
  * waits for the end of the transmission.
  *
@@ -988,7 +1021,7 @@ MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
                                    (dest, channel), task, timeout);
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
  * \brief Test whether there is a pending communication on a channel, and who sent it.
  *
  * It takes one parameter.
@@ -1002,8 +1035,6 @@ int MSG_task_probe_from(m_channel_t channel)
   XBT_WARN("DEPRECATED! Now use MSG_task_listen_from");
   m_task_t task;
 
-  CHECK_HOST();
-
   xbt_assert((channel >= 0)
               && (channel < msg_global->max_channel), "Invalid channel %d",
               channel);
@@ -1017,7 +1048,7 @@ int MSG_task_probe_from(m_channel_t channel)
   return MSG_process_get_PID(task->simdata->sender);
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
  * \brief Test whether there is a pending communication on a channel.
  *
  * It takes one parameter.
@@ -1033,14 +1064,12 @@ int MSG_task_Iprobe(m_channel_t channel)
               && (channel < msg_global->max_channel), "Invalid channel %d",
               channel);
 
-  CHECK_HOST();
-
   return
       !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel
                             (MSG_host_self(), channel));
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
 
  * \brief Return the number of tasks waiting to be received on a \a
  channel and sent by \a host.
@@ -1060,8 +1089,6 @@ int MSG_task_probe_from_host(int channel, m_host_t host)
               && (channel < msg_global->max_channel), "Invalid channel %d",
               channel);
 
-  CHECK_HOST();
-
   return
       MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel
                                                (MSG_host_self(), channel),
@@ -1069,7 +1096,7 @@ int MSG_task_probe_from_host(int channel, m_host_t host)
 
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
  * \brief Listen on \a channel and waits for receiving a task from \a host.
  *
  * It takes three parameters.
@@ -1090,7 +1117,7 @@ MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host)
   return MSG_task_get_ext(task, channel, -1, host);
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
  * \brief Listen on a channel and wait for receiving a task.
  *
  * It takes two parameters.
@@ -1109,7 +1136,7 @@ MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel)
   return MSG_task_get_with_timeout(task, channel, -1);
 }
 
-/** \ingroup msg_gos_functions
+/** \ingroup msg_deprecated_functions
  * \brief Listen on a channel and wait for receiving a task with a timeout.
  *
  * It takes three parameters.