X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c3701e24626a87cef600fc29484a4e4b82e28be..c18de7d827becb81d9c622bf0c58626eadf32fed:/src/msg/msg_task.c

diff --git a/src/msg/msg_task.c b/src/msg/msg_task.c
index 8f4e7fd122..5e9bedf513 100644
--- a/src/msg/msg_task.c
+++ b/src/msg/msg_task.c
@@ -8,12 +8,8 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
-/** \defgroup m_task_management Managing functions of Tasks
- *  \brief This section describes the task structure of MSG
- *  (#m_task_t) and the functions for managing it.
- */
 /** @addtogroup m_task_management
- *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Tasks" --> \endhtmlonly
+ *    
  * 
  *  Since most scheduling algorithms rely on a concept of task
  *  that can be either <em>computed</em> locally or
@@ -39,7 +35,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg,
    MSG_task_execute(). This value has to be >=0.
  * \param message_size a value of the amount of data (in bytes) needed to
    transfer this new task. If 0, then it cannot be transfered with
-   MSG_task_get() and MSG_task_put(). This value has to be >=0.
+   MSG_task_send() and MSG_task_recv(). This value has to be >=0.
  * \param data a pointer to any data may want to attach to the new
    object.  It is for user-level information and can be NULL. It can
    be retrieved with the function \ref MSG_task_get_data.
@@ -52,22 +48,24 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   m_task_t task = xbt_new(s_m_task_t, 1);
   simdata_task_t simdata = xbt_new(s_simdata_task_t, 1);
   task->simdata = simdata;
+
   /* Task structure */
   task->name = xbt_strdup(name);
   task->data = data;
 
   /* Simulator Data */
-  simdata->host_nb = 0;
-  simdata->computation_amount = compute_duration;
+  simdata->compute = NULL;
+  simdata->comm = NULL;
   simdata->message_size = message_size;
-  simdata->rate = -1.0;
-  simdata->priority = 1.0;
-  simdata->isused = 0;
+  simdata->computation_amount = compute_duration;
   simdata->sender = NULL;
   simdata->receiver = NULL;
-  simdata->compute = NULL;
-  simdata->comm = NULL;
+  simdata->source = NULL;
+  simdata->priority = 1.0;
+  simdata->rate = -1.0;
+  simdata->isused = 0;
 
+  simdata->host_nb = 0;
   simdata->host_list = NULL;
   simdata->comp_amount = NULL;
   simdata->comm_amount = NULL;
@@ -116,7 +114,7 @@ m_gpu_task_t MSG_gpu_task_create(const char *name, double compute_duration,
 
 #ifdef HAVE_TRACING
   //FIXME
-  TRACE_msg_gpu_task_create(task);
+  /* TRACE_msg_gpu_task_create(task); */
 #endif
 
   return task;
@@ -200,7 +198,7 @@ const char *MSG_task_get_name(m_task_t task)
 }
 
 /** \ingroup m_task_management
- * \brief Return the name of a #m_task_t.
+ * \brief Sets the name of a #m_task_t.
  *
  * This functions allows to associate a name to a task
  */
@@ -252,7 +250,7 @@ MSG_error_t MSG_task_destroy(m_task_t task)
 }
 
 
-/** \ingroup m_task_management
+/** \ingroup m_task_usage
  * \brief Cancel a #m_task_t.
  * \param task the task to cancel. If it was executed or transfered, it
           stops the process that were working on it.