X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8870e4a485d50ed72f249b345c8338dd6ef1b7f7..df12bbc75c274351f3b3a628740e0b3270f08e18:/src/msg/msg_task.c

diff --git a/src/msg/msg_task.c b/src/msg/msg_task.c
index 20f25d4afa..ab9cc8016b 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;
@@ -78,6 +76,47 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   return task;
 }
 
+/** \ingroup m_task_management
+ * \brief Creates a new #m_task_t (a parallel one....).
+ *
+ * A constructor for #m_task_t taking six arguments and returning the
+ corresponding object.
+ * \param name a name for the object. It is for user-level information
+ and can be NULL.
+ * \param host_nb the number of hosts implied in the parallel task.
+ * \param host_list an array of \p host_nb msg_host_t.
+ * \param computation_amount an array of \p host_nb
+ doubles. computation_amount[i] is the total number of operations
+ that have to be performed on host_list[i].
+ * \param communication_amount an array of \p host_nb* \p host_nb doubles.
+ * \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.
+ * \see m_task_t
+ * \return The new corresponding object.
+ */
+m_task_t
+MSG_parallel_task_create(const char *name, int host_nb,
+                         const msg_host_t * host_list,
+                         double *computation_amount,
+                         double *communication_amount, void *data)
+{
+  m_task_t task = MSG_task_create(name, 0, 0, data);
+  simdata_task_t simdata = task->simdata;
+  int i;
+
+  /* Simulator Data specific to parallel tasks */
+  simdata->host_nb = host_nb;
+  simdata->host_list = xbt_new0(smx_host_t, host_nb);
+  simdata->comp_amount = computation_amount;
+  simdata->comm_amount = communication_amount;
+
+  for (i = 0; i < host_nb; i++)
+    simdata->host_list[i] = host_list[i]->smx_host;
+
+  return task;
+}
+
 /*************** Begin GPU ***************/
 /** \ingroup m_task_management
  * \brief Creates a new #m_gpu_task_t.
@@ -154,7 +193,7 @@ void MSG_task_set_data(m_task_t task, void *data)
  * \param callback a callback function
  */
 void MSG_task_set_copy_callback(void (*callback)
-    (m_task_t task, m_process_t sender, m_process_t receiver)) {
+    (m_task_t task, msg_process_t sender, msg_process_t receiver)) {
 
   msg_global->task_copy_callback = callback;
 
@@ -169,9 +208,9 @@ void MSG_task_set_copy_callback(void (*callback)
 /** \ingroup m_task_management
  * \brief Return the sender of a #m_task_t.
  *
- * This functions returns the #m_process_t which sent this task
+ * This functions returns the #msg_process_t which sent this task
  */
-m_process_t MSG_task_get_sender(m_task_t task)
+msg_process_t MSG_task_get_sender(m_task_t task)
 {
   xbt_assert(task, "Invalid parameters");
   return ((simdata_task_t) task->simdata)->sender;
@@ -180,9 +219,9 @@ m_process_t MSG_task_get_sender(m_task_t task)
 /** \ingroup m_task_management
  * \brief Return the source of a #m_task_t.
  *
- * This functions returns the #m_host_t from which this task was sent
+ * This functions returns the #msg_host_t from which this task was sent
  */
-m_host_t MSG_task_get_source(m_task_t task)
+msg_host_t MSG_task_get_source(m_task_t task)
 {
   xbt_assert(task, "Invalid parameters");
   return ((simdata_task_t) task->simdata)->source;
@@ -200,7 +239,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 +291,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.