X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/710e7c0ce3fce936637636f544019e89e8ef023d..2fad952ef4a63aedf6c8b2dc4e371de849f1e163:/src/msg/task.c

diff --git a/src/msg/task.c b/src/msg/task.c
index d0f600166c..80a7c72692 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -13,6 +13,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(task, msg,
 
 static char sprint_buffer[64];
 
+/** \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.
+ *
+ *  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
+ *  right level of abstraction for our purposes. A <em>task</em>
+ *  may then be defined by a <em>computing amount</em>, a
+ *  <em>message size</em> and some <em>private data</em>.
+ */
+
 /********************************* Task **************************************/
 /** \ingroup m_task_management
  * \brief Creates a new #m_task_t.
@@ -48,9 +60,11 @@ m_task_t MSG_task_create(const char *name, long double compute_duration,
   simdata->sleeping = xbt_dynar_new(sizeof(m_process_t),NULL);
   simdata->computation_amount = compute_duration;
   simdata->message_size = message_size;
+  simdata->rate = -1.0;
   simdata->using = 1;
   simdata->sender = NULL;
 
+
   return task;
 }
 
@@ -67,6 +81,18 @@ void *MSG_task_get_data(m_task_t task)
   return (task->data);
 }
 
+/** \ingroup m_task_management
+ * \brief Return the sender of a #m_task_t.
+ *
+ * This functions returns the #m_process_t which sent this task
+ */
+m_process_t MSG_task_get_sender(m_task_t task)
+{
+   xbt_assert0(task, "Invalid parameters");
+   return ((simdata_task_t) task->simdata)->sender;
+}
+
+
 /** \ingroup m_task_management
  * \brief Destroy a #m_task_t.
  *
@@ -80,12 +106,13 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   int i;
 
   xbt_assert0((task != NULL), "Invalid parameter");
-  xbt_assert0((xbt_dynar_length(task->simdata->sleeping)==0), 
-	      "Task still used. Cannot destroy it now!");
 
   task->simdata->using--;
   if(task->simdata->using>0) return MSG_OK;
 
+  xbt_assert0((xbt_dynar_length(task->simdata->sleeping)==0), 
+	      "Task still used. There is a problem. Cannot destroy it now!");
+
   if(task->name) xbt_free(task->name);
 
   xbt_dynar_free(&(task->simdata->sleeping));
@@ -154,13 +181,20 @@ MSG_error_t MSG_task_destroy(m_task_t task)
 
 MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task)
 {
+  int _cursor;
+  m_process_t proc = NULL;
+
   xbt_assert0(((task != NULL)
 	       && (task->simdata != NULL)), "Invalid parameters");
 
-  xbt_dynar_push(task->simdata->sleeping, process);
+  xbt_dynar_push(task->simdata->sleeping, &process);
   process->simdata->waiting_task = task;
-  xbt_context_yield(process->simdata->context);
+  xbt_context_yield();
   process->simdata->waiting_task = NULL;
+  xbt_dynar_foreach(task->simdata->sleeping,_cursor,proc) {
+    if(proc==process) 
+      xbt_dynar_remove_at(task->simdata->sleeping,_cursor,&proc);
+  }
 
   return MSG_OK;
 }