X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..954676b700e711f38ec4d286d33d5427d3f4ca46:/src/msg/msg_task.c

diff --git a/src/msg/msg_task.c b/src/msg/msg_task.c
index aee793c7d1..3db6204fbd 100644
--- a/src/msg/msg_task.c
+++ b/src/msg/msg_task.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,8 +10,8 @@
 #include "xbt/log.h"
 
 /** @addtogroup m_task_management
- *    
- * 
+ *
+ *
  *  Since most scheduling algorithms rely on a concept of task
  *  that can be either <em>computed</em> locally or
  *  <em>transferred</em> on another processor, it seems to be the
@@ -31,7 +31,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg,
    corresponding object.
  * \param name a name for the object. It is for user-level information
    and can be NULL.
- * \param compute_duration a value of the processing amount (in flop)
+ * \param flop_amount a value of the processing amount (in flop)
    needed to process this new task. If 0, then it cannot be executed with
    MSG_task_execute(). This value has to be >=0.
  * \param message_size a value of the amount of data (in bytes) needed to
@@ -43,7 +43,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg,
  * \see msg_task_t
  * \return The new corresponding object.
  */
-msg_task_t MSG_task_create(const char *name, double compute_duration,
+msg_task_t MSG_task_create(const char *name, double flop_amount,
                          double message_size, void *data)
 {
   msg_task_t task = xbt_new(s_msg_task_t, 1);
@@ -57,8 +57,8 @@ msg_task_t MSG_task_create(const char *name, double compute_duration,
   /* Simulator Data */
   simdata->compute = NULL;
   simdata->comm = NULL;
-  simdata->message_size = message_size;
-  simdata->computation_amount = compute_duration;
+  simdata->bytes_amount = message_size;
+  simdata->flops_amount = flop_amount;
   simdata->sender = NULL;
   simdata->receiver = NULL;
   simdata->source = NULL;
@@ -70,11 +70,9 @@ msg_task_t MSG_task_create(const char *name, double compute_duration,
 
   simdata->host_nb = 0;
   simdata->host_list = NULL;
-  simdata->comp_amount = NULL;
-  simdata->comm_amount = NULL;
-#ifdef HAVE_TRACING
+  simdata->flops_parallel_amount = NULL;
+  simdata->bytes_parallel_amount = NULL;
   TRACE_msg_task_create(task);
-#endif
 
   return task;
 }
@@ -88,21 +86,20 @@ msg_task_t MSG_task_create(const char *name, double compute_duration,
  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.
+ * \param flops_amount an array of \p host_nb doubles.
+ *                     flops_amount[i] is the total number of operations that have to be performed on host_list[i].
+ * \param bytes_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 msg_task_t
  * \return The new corresponding object.
  */
 msg_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)
+                         double *flops_amount,
+                         double *bytes_amount, void *data)
 {
   msg_task_t task = MSG_task_create(name, 0, 0, data);
   simdata_task_t simdata = task->simdata;
@@ -110,9 +107,9 @@ MSG_parallel_task_create(const char *name, int host_nb,
 
   /* 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;
+  simdata->host_list = xbt_new0(sg_host_t, host_nb);
+  simdata->flops_parallel_amount = flops_amount;
+  simdata->bytes_parallel_amount = bytes_amount;
 
   for (i = 0; i < host_nb; i++)
     simdata->host_list[i] = host_list[i];
@@ -130,7 +127,7 @@ MSG_parallel_task_create(const char *name, int host_nb,
  * \param name a name for the object. It is for user-level information
    and can be NULL.
 
- * \param compute_duration a value of the processing amount (in flop)
+ * \param flops_amount a value of the processing amount (in flop)
    needed to process this new task. If 0, then it cannot be executed with
    MSG_gpu_task_execute(). This value has to be >=0.
 
@@ -142,7 +139,7 @@ MSG_parallel_task_create(const char *name, int host_nb,
  * \see msg_gpu_task_t
  * \return The new corresponding object.
  */
-msg_gpu_task_t MSG_gpu_task_create(const char *name, double compute_duration,
+msg_gpu_task_t MSG_gpu_task_create(const char *name, double flops_amount,
                          double dispatch_latency, double collect_latency)
 {
   msg_gpu_task_t task = xbt_new(s_msg_gpu_task_t, 1);
@@ -152,14 +149,11 @@ msg_gpu_task_t MSG_gpu_task_create(const char *name, double compute_duration,
   task->name = xbt_strdup(name);
 
   /* Simulator Data */
-  simdata->computation_amount = compute_duration;
+  simdata->flops_amount = flops_amount;
   simdata->dispatch_latency   = dispatch_latency;
   simdata->collect_latency    = collect_latency;
 
-#ifdef HAVE_TRACING
-  //FIXME
-  /* TRACE_msg_gpu_task_create(task); */
-#endif
+  /* TRACE_msg_gpu_task_create(task); FIXME*/
 
   return task;
 }
@@ -266,22 +260,20 @@ void MSG_task_set_name(msg_task_t task, const char *name)
  */
 msg_error_t MSG_task_destroy(msg_task_t task)
 {
-  smx_action_t action = NULL;
+  smx_synchro_t action = NULL;
   xbt_assert((task != NULL), "Invalid parameter");
 
   if (task->simdata->isused) {
     /* the task is being sent or executed: cancel it first */
     MSG_task_cancel(task);
   }
-#ifdef HAVE_TRACING
   TRACE_msg_task_destroy(task);
-#endif
 
   xbt_free(task->name);
 
   action = task->simdata->compute;
   if (action)
-    simcall_host_execution_destroy(action);
+    simcall_process_execution_destroy(action);
 
   /* parallel tasks only */
   xbt_free(task->simdata->host_list);
@@ -306,27 +298,31 @@ msg_error_t MSG_task_cancel(msg_task_t task)
   xbt_assert((task != NULL), "Cannot cancel a NULL task");
 
   if (task->simdata->compute) {
-    simcall_host_execution_cancel(task->simdata->compute);
+    simcall_process_execution_cancel(task->simdata->compute);
   }
   else if (task->simdata->comm) {
-    simcall_comm_cancel(task->simdata->comm);
-    task->simdata->isused = 0;
+    simdata_task_t simdata = task->simdata;
+    simcall_comm_cancel(simdata->comm);
+    if (msg_global->debug_multiple_use && simdata->isused!=0)
+      xbt_ex_free(*(xbt_ex_t*)simdata->isused);
+    simdata->isused = 0;
   }
   return MSG_OK;
 }
 
 /** \ingroup m_task_management
- * \brief Returns the computation amount needed to process a task #msg_task_t.
+ * \brief Returns the remaining amount of flops needed to execute a task #msg_task_t.
  *
  * Once a task has been processed, this amount is set to 0. If you want, you
- * can reset this value with #MSG_task_set_compute_duration before restarting the task.
+ * can reset this value with #MSG_task_set_flops_amount before restarting the task.
  */
-double MSG_task_get_compute_duration(msg_task_t task)
-{
-  xbt_assert((task != NULL)
-              && (task->simdata != NULL), "Invalid parameter");
+double MSG_task_get_flops_amount(msg_task_t task) {
 
-  return task->simdata->computation_amount;
+	if (task->simdata->compute) {
+		return simcall_process_execution_get_remains(task->simdata->compute);
+	} else {
+		return task->simdata->flops_amount;
+	}
 }
 
 
@@ -334,55 +330,29 @@ double MSG_task_get_compute_duration(msg_task_t task)
  * \brief set the computation amount needed to process a task #msg_task_t.
  *
  * \warning If the computation is ongoing (already started and not finished),
- * it is not modified by this call. And the termination of the ongoing task with
- * set the computation_amount to zero, overriding any value set during the
- * execution.
+ * it is not modified by this call. Moreover, after its completion, the ongoing
+ * execution with set the flops_amount to zero, overriding any value set during
+ * the execution.
  */
 
-void MSG_task_set_compute_duration(msg_task_t task,
-                                   double computation_amount)
+void MSG_task_set_flops_amount(msg_task_t task, double flops_amount)
 {
-  xbt_assert(task, "Invalid parameter");
-  task->simdata->computation_amount = computation_amount;
-
+  task->simdata->flops_amount = flops_amount;
 }
 
 /** \ingroup m_task_management
  * \brief set the amount data attached with a task #msg_task_t.
  *
  * \warning If the transfer is ongoing (already started and not finished),
- * it is not modified by this call. 
+ * it is not modified by this call.
  */
 
-void MSG_task_set_data_size(msg_task_t task,
-                                   double data_size)
+void MSG_task_set_bytes_amount(msg_task_t task, double data_size)
 {
-  xbt_assert(task, "Invalid parameter");
-  task->simdata->message_size = data_size;
-
+  task->simdata->bytes_amount = data_size;
 }
 
 
-
-/** \ingroup m_task_management
- * \brief Returns the remaining computation amount of a task #msg_task_t.
- *
- * If the task is ongoing, this call retrieves the remaining amount of work.
- * If it is not ongoing, it returns the total amount of work that will be
- * executed when the task starts.
- */
-double MSG_task_get_remaining_computation(msg_task_t task)
-{
-  xbt_assert((task != NULL)
-              && (task->simdata != NULL), "Invalid parameter");
-
-  if (task->simdata->compute) {
-    return simcall_host_execution_get_remains(task->simdata->compute);
-  } else {
-    return task->simdata->computation_amount;
-  }
-}
-
 /** \ingroup m_task_management
  * \brief Returns the total amount received by a task #msg_task_t.
  *        If the communication does not exist it will return 0.
@@ -417,18 +387,18 @@ int MSG_task_is_latency_bounded(msg_task_t task)
  * \brief Returns the size of the data attached to a task #msg_task_t.
  *
  */
-double MSG_task_get_data_size(msg_task_t task)
+double MSG_task_get_bytes_amount(msg_task_t task)
 {
   xbt_assert((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
 
-  return task->simdata->message_size;
+  return task->simdata->bytes_amount;
 }
 
 
 
 /** \ingroup m_task_management
- * \brief Changes the priority of a computation task. This priority doesn't affect 
+ * \brief Changes the priority of a computation task. This priority doesn't affect
  *        the transfer rate. A priority of 2 will make a task receive two times more
  *        cpu power than the other ones.
  *
@@ -440,7 +410,7 @@ void MSG_task_set_priority(msg_task_t task, double priority)
 
   task->simdata->priority = 1 / priority;
   if (task->simdata->compute)
-    simcall_host_execution_set_priority(task->simdata->compute,
+    simcall_process_execution_set_priority(task->simdata->compute,
                                       task->simdata->priority);
 }
 
@@ -461,7 +431,7 @@ void MSG_task_set_bound(msg_task_t task, double bound)
 
   task->simdata->bound = bound;
   if (task->simdata->compute)
-    simcall_host_execution_set_bound(task->simdata->compute,
+    simcall_process_execution_set_bound(task->simdata->compute,
                                       task->simdata->bound);
 }
 
@@ -480,7 +450,7 @@ void MSG_task_set_bound(msg_task_t task, double bound)
  *
  * Usage:
  * 0. Define a host with multiple cores.
- *    <host id="PM0" power="1E8" core="2"/>
+ *    \<host id="PM0" power="1E8" core="2"/\>
  *
  * 1. Pin a given task to the first CPU core of a host.
  *   MSG_task_set_affinity(task, pm0, 0x01);
@@ -519,7 +489,7 @@ void MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask)
         xbt_dict_remove_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(host));
     }
   } else
-    xbt_dict_set_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(host), (void *) mask, NULL);
+    xbt_dict_set_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(host), (void *)(uintptr_t) mask, NULL);
 
   /* We set affinity data of this task. If the task is being executed, we
    * actually change the affinity setting of the task. Otherwise, this change
@@ -532,7 +502,7 @@ void MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask)
   }
 
   {
-    smx_action_t compute = task->simdata->compute;
+    smx_synchro_t compute = task->simdata->compute;
     msg_host_t host_now = compute->execution.host;  // simix_private.h is necessary
     if (host_now != host) {
       /* task is not yet executed on this host */
@@ -543,11 +513,10 @@ void MSG_task_set_affinity(msg_task_t task, msg_host_t host, unsigned long mask)
     /* task is being executed on this host. so change the affinity now */
     {
       /* check it works. remove me if it works. */
-      unsigned long affinity_mask = (unsigned long) xbt_dict_get_or_null_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(msg_host_t));
-      xbt_assert(affinity_mask == mask);
+      xbt_assert((unsigned long)(uintptr_t) xbt_dict_get_or_null_ext(task->simdata->affinity_mask_db, (char *) host, sizeof(msg_host_t)) == mask);
     }
 
     XBT_INFO("set affinity(0x%04lx@%s) for %s", mask, MSG_host_get_name(host), MSG_task_get_name(task));
-    simcall_host_execution_set_affinity(task->simdata->compute, host, mask);
+    simcall_process_execution_set_affinity(task->simdata->compute, host, mask);
   }
 }