X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..f5fd55f293d7e019e8c23e7ff76e2b3743e40cd6:/src/msg/task.c

diff --git a/src/msg/task.c b/src/msg/task.c
index 38a1b8fca4..e085aefd35 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -68,11 +68,9 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   simdata->message_size = message_size;
   simdata->rate = -1.0;
   simdata->priority = 1.0;
-  simdata->refcount = 1;
+  simdata->isused = 0;
   simdata->sender = NULL;
   simdata->receiver = NULL;
-  simdata->cond = SIMIX_cond_init();
-  simdata->mutex = SIMIX_mutex_init();
   simdata->compute = NULL;
   simdata->comm = NULL;
 
@@ -156,12 +154,6 @@ void MSG_task_set_name(m_task_t task, const char *name)
   task->name = xbt_strdup(name);
 }
 
-
-void MSG_task_refcount_dec(m_task_t task)
-{
-  task->simdata->refcount--;
-}
-
 /** \ingroup m_task_management
  * \brief Destroy a #m_task_t.
  *
@@ -174,9 +166,10 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   xbt_assert0((task != NULL), "Invalid parameter");
 
   /* why? if somebody is using, then you can't free! ok... but will return MSG_OK? when this task will be destroyed? isn't the user code wrong? */
-  task->simdata->refcount--;
-  if (task->simdata->refcount > 0)
+  if (task->simdata->isused > 0) {
+    DEBUG1("Cannot destroy task %p since somebody is using it", task);
     return MSG_OK;
+  }
 #ifdef HAVE_TRACING
   TRACE_msg_task_destroy(task);
 #endif
@@ -184,12 +177,9 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   if (task->name)
     free(task->name);
 
-  SIMIX_cond_destroy(task->simdata->cond);
-  SIMIX_mutex_destroy(task->simdata->mutex);
-
   action = task->simdata->compute;
   if (action)
-    SIMIX_action_destroy(action);
+    SIMIX_req_host_execution_destroy(action);
 
   /* parallel tasks only */
   if (task->simdata->host_list)
@@ -213,11 +203,11 @@ MSG_error_t MSG_task_cancel(m_task_t task)
   xbt_assert0((task != NULL), "Invalid parameter");
 
   if (task->simdata->compute) {
-    SIMIX_action_cancel(task->simdata->compute);
+    SIMIX_req_host_execution_cancel(task->simdata->compute);
     return MSG_OK;
   }
   if (task->simdata->comm) {
-    SIMIX_communication_cancel(task->simdata->comm);
+    SIMIX_req_comm_cancel(task->simdata->comm);
     return MSG_OK;
   }
   THROW_IMPOSSIBLE;
@@ -258,7 +248,7 @@ double MSG_task_get_remaining_computation(m_task_t task)
               && (task->simdata != NULL), "Invalid parameter");
 
   if (task->simdata->compute) {
-    return SIMIX_action_get_remains(task->simdata->compute);
+    return SIMIX_req_host_execution_get_remains(task->simdata->compute);
   } else {
     return task->simdata->computation_amount;
   }
@@ -266,15 +256,17 @@ double MSG_task_get_remaining_computation(m_task_t task)
 
 /** \ingroup m_task_management
  * \brief Returns the total amount received by a task #m_task_t.
- *
+ *        If the communication does not exist it will return 0.
+ *        So, if the communication has FINISHED or FAILED it returns
+ *        zero.
  */
 double MSG_task_get_remaining_communication(m_task_t task)
 {
   xbt_assert0((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
-  DEBUG1("calling SIMIX_communication_get_remains(%p)",
+  DEBUG1("calling SIMIX_req_communication_get_remains(%p)",
          task->simdata->comm);
-  return SIMIX_communication_get_remains(task->simdata->comm);
+  return SIMIX_req_comm_get_remains(task->simdata->comm);
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
@@ -286,9 +278,9 @@ int MSG_task_is_latency_bounded(m_task_t task)
 {
   xbt_assert0((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
-  DEBUG1("calling SIMIX_communication_is_latency_bounded(%p)",
+  DEBUG1("calling SIMIX_req_communication_is_latency_bounded(%p)",
          task->simdata->comm);
-  return SIMIX_communication_is_latency_bounded(task->simdata->comm);
+  return SIMIX_req_comm_is_latency_bounded(task->simdata->comm);
 }
 #endif
 
@@ -319,6 +311,6 @@ void MSG_task_set_priority(m_task_t task, double priority)
 
   task->simdata->priority = 1 / priority;
   if (task->simdata->compute)
-    SIMIX_action_set_priority(task->simdata->compute,
-                              task->simdata->priority);
+    SIMIX_req_host_execution_set_priority(task->simdata->compute,
+                                      task->simdata->priority);
 }