X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc4d29e13ac8f50db7bf282457140561048c7ed6..212a22112855f8531e29e54f0db872ec4f0f4b7e:/src/msg/task.c

diff --git a/src/msg/task.c b/src/msg/task.c
index 8d9cfa6035..e1f3f7a850 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -5,18 +5,15 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(task, msg,
-				"Logging specific to MSG (task)");
-
-static char sprint_buffer[64];
+#include "private.h"
+#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.
- *
+ *    \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
  *  <em>transferred</em> on another processor, it seems to be the
@@ -48,12 +45,11 @@ static char sprint_buffer[64];
 m_task_t MSG_task_create(const char *name, double compute_duration,
 			 double message_size, void *data)
 {
-  simdata_task_t simdata = xbt_new0(s_simdata_task_t,1);
-  m_task_t task = xbt_new0(s_m_task_t,1);
+  m_task_t task = xbt_mallocator_get(msg_global->task_mallocator);
+  simdata_task_t simdata = task->simdata;
   
   /* Task structure */
   task->name = xbt_strdup(name);
-  task->simdata = simdata;
   task->data = data;
 
   /* Simulator Data */
@@ -61,6 +57,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   simdata->computation_amount = compute_duration;
   simdata->message_size = message_size;
   simdata->rate = -1.0;
+  simdata->priority = 1.0;
   simdata->using = 1;
   simdata->sender = NULL;
 
@@ -91,6 +88,17 @@ m_process_t MSG_task_get_sender(m_task_t task)
    return ((simdata_task_t) task->simdata)->sender;
 }
 
+/** \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
+ */
+m_host_t MSG_task_get_source(m_task_t task)
+{
+   xbt_assert0(task, "Invalid parameters");
+   return ((simdata_task_t) task->simdata)->source;
+}
+
 /** \ingroup m_task_management
  * \brief Return the name of a #m_task_t.
  *
@@ -111,10 +119,7 @@ const char *MSG_task_get_name(m_task_t task)
  */
 MSG_error_t MSG_task_destroy(m_task_t task)
 {
-  simdata_task_t simdata = NULL;
   surf_action_t action = NULL;
-  int i;
-
   xbt_assert0((task != NULL), "Invalid parameter");
 
   task->simdata->using--;
@@ -131,89 +136,68 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   if(action) action->resource_type->common_public->action_free(action);
   action = task->simdata->comm;
   if(action) action->resource_type->common_public->action_free(action);
+  if(task->simdata->host_list) xbt_free(task->simdata->host_list);
 
-
-  free(task->simdata);
-  free(task);
-
+  xbt_mallocator_release(msg_global->task_mallocator, task);
   return MSG_OK;
 }
 
+
 /** \ingroup m_task_management
- * \brief Returns the computation amount needed to process a task #m_task_t.
- *
+ * \brief Cancel a #m_task_t.
+ * \param task the taskt to cancel. If it was executed or transfered, it 
+          stops the process that were working on it.
  */
-double MSG_task_get_compute_duration(m_task_t task)
+MSG_error_t MSG_task_cancel(m_task_t task)
 {
-  simdata_task_t simdata = NULL;
+  xbt_assert0((task != NULL), "Invalid parameter");
+
+  if(task->simdata->compute) {
+    surf_workstation_resource->common_public->action_cancel(task->simdata->compute);
+    return MSG_OK;
+  }
+  if(task->simdata->comm) {
+    surf_workstation_resource->common_public->action_cancel(task->simdata->comm);
+    return MSG_OK;
+  }
 
+  return MSG_FATAL;
+}
+
+/** \ingroup m_task_management
+ * \brief Returns the computation amount needed to process a task #m_task_t.
+ *        Once a task has been processed, this amount is thus set to 0...
+ */
+double MSG_task_get_compute_duration(m_task_t task) {
   xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
 
   return task->simdata->computation_amount;
 }
 
 /** \ingroup m_task_management
- * \brief Returns the size of the data attached to a task #m_task_t.
+ * \brief Returns the remaining computation amount of a task #m_task_t.
  *
  */
-double MSG_task_get_data_size(m_task_t task)
+double MSG_task_get_remaining_computation(m_task_t task)
 {
-  simdata_task_t simdata = NULL;
-
   xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
 
-  return task->simdata->message_size;
+  if(task->simdata->compute) {
+    return task->simdata->compute->remains;
+  } else {
+    return task->simdata->computation_amount;
+  }
 }
 
-/* static MSG_error_t __MSG_task_check(m_task_t task) */
-/* { */
-/*   simdata_task_t simdata = NULL; */
-/*   int warning = 0; */
-
-/*   if (task == NULL) {		/\* Fatal *\/ */
-/*     WARNING("Task uninitialized"); */
-/*     return MSG_FATAL; */
-/*   } */
-/*   simdata = task->simdata; */
-
-/*   if (simdata == NULL) {	/\* Fatal *\/ */
-/*     WARNING("Simulator Data uninitialized"); */
-/*     return MSG_FATAL; */
-/*   } */
-
-/*   if (simdata->compute == NULL) {	/\* Fatal if execute ... *\/ */
-/*     WARNING("No duration set for this task"); */
-/*     warning++; */
-/*   } */
-
-/*   if (simdata->message_size == 0) {	/\* Fatal if transfered ... *\/ */
-/*     WARNING("No message_size set for this task"); */
-/*     warning++; */
-/*   } */
-
-/* /\*    if (task->data == NULL) { *\/ */
-/* /\*      WARNING("User Data uninitialized"); *\/ */
-/* /\*      warning++; *\/ */
-/* /\*    } *\/ */
-
-/*   if (warning) */
-/*     return MSG_WARNING; */
-/*   return MSG_OK; */
-/* } */
-
-/* static m_task_t __MSG_task_copy(m_task_t src) */
-/* { */
-/*   m_task_t copy = NULL; */
-/*   simdata_task_t simdata = NULL; */
-
-/*   __MSG_task_check(src); */
-
-/*   simdata = src->simdata; */
-/*   copy = MSG_task_create(src->name, SG_getTaskCost(simdata->compute), */
-/* 			 simdata->message_size, MSG_task_get_data(src)); */
+/** \ingroup m_task_management
+ * \brief Returns the size of the data attached to a task #m_task_t.
+ *
+ */
+double MSG_task_get_data_size(m_task_t task) {
+  xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
 
-/*   return (copy); */
-/* } */
+  return task->simdata->message_size;
+}
 
 MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task)
 {
@@ -234,3 +218,40 @@ MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task)
 
   return MSG_OK;
 }
+
+
+/** \ingroup m_task_management
+ * \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.
+ *
+ */
+void MSG_task_set_priority(m_task_t task, double priority) {
+  xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
+
+  task->simdata->priority = 1/priority;
+  if(task->simdata->compute)
+    surf_workstation_resource->common_public->
+      set_priority(task->simdata->compute, task->simdata->priority);
+}
+
+/* Mallocator functions */
+m_task_t task_mallocator_new_f(void) {
+  m_task_t task = xbt_new(s_m_task_t, 1);
+  simdata_task_t simdata = xbt_new0(s_simdata_task_t, 1);
+  task->simdata = simdata;
+  return task;
+}
+
+void task_mallocator_free_f(m_task_t task) {
+  xbt_assert0((task != NULL), "Invalid parameter");
+
+  xbt_free(task->simdata);
+  xbt_free(task);
+
+  return;
+}
+
+void task_mallocator_reset_f(m_task_t task) {
+  memset(task->simdata, 0, sizeof(s_simdata_task_t));  
+}