moving include/surf to src/include/surf (continued)

[simgrid.git] / src / msg / task.c

diff --git a/src/msg/task.c b/src/msg/task.c
index 552c95a..007160c 100644 (file)
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -48,6 +48,10 @@ 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->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;
 }
 
   return task;
 }


@@ -65,6 +69,18 @@ void *MSG_task_get_data(m_task_t task)
   return (task->data);
 }
 
   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.
  *
 /** \ingroup m_task_management
  * \brief Destroy a #m_task_t.
  *


@@ -78,8 +94,12 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   int i;
 
   xbt_assert0((task != NULL), "Invalid parameter");
   int i;
 
   xbt_assert0((task != NULL), "Invalid parameter");

+
+  task->simdata->using--;
+  if(task->simdata->using>0) return MSG_OK;
+

   xbt_assert0((xbt_dynar_length(task->simdata->sleeping)==0), 
   xbt_assert0((xbt_dynar_length(task->simdata->sleeping)==0), 

-             "Task still used. Cannot destroy it now!");
+             "Task still used. There is a problem. Cannot destroy it now!");

 
   if(task->name) xbt_free(task->name);
 
 
   if(task->name) xbt_free(task->name);
 


@@ -149,13 +169,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)
 {
 
 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_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;
   process->simdata->waiting_task = task;

-  xbt_context_yield(process->simdata->context);
+  xbt_context_yield();

   process->simdata->waiting_task = NULL;
   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;
 }
 
   return MSG_OK;
 }