Kill the braindead MSG_task_refcount_dec() function.

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

diff --git a/src/msg/task.c b/src/msg/task.c
index 1688629..88c743d 100644 (file)
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -71,8 +71,6 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   simdata->refcount = 1;
   simdata->sender = NULL;
   simdata->receiver = NULL;
   simdata->refcount = 1;
   simdata->sender = NULL;
   simdata->receiver = NULL;

-  simdata->cond = SIMIX_cond_init();
-  simdata->mutex = SIMIX_mutex_init();

   simdata->compute = NULL;
   simdata->comm = NULL;
 
   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);
 }
 
   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.
  *
 /** \ingroup m_task_management
  * \brief Destroy a #m_task_t.
  *


@@ -184,12 +176,9 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   if (task->name)
     free(task->name);
 
   if (task->name)
     free(task->name);
 

-  SIMIX_cond_destroy(task->simdata->cond);
-  SIMIX_mutex_destroy(task->simdata->mutex);
-

   action = task->simdata->compute;
   if (action)
   action = task->simdata->compute;
   if (action)

-    SIMIX_action_destroy(action);
+    SIMIX_req_host_execution_destroy(action);

 
   /* parallel tasks only */
   if (task->simdata->host_list)
 
   /* parallel tasks only */
   if (task->simdata->host_list)


@@ -213,11 +202,11 @@ MSG_error_t MSG_task_cancel(m_task_t task)
   xbt_assert0((task != NULL), "Invalid parameter");
 
   if (task->simdata->compute) {
   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) {
     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;
     return MSG_OK;
   }
   THROW_IMPOSSIBLE;


@@ -258,7 +247,7 @@ double MSG_task_get_remaining_computation(m_task_t task)
               && (task->simdata != NULL), "Invalid parameter");
 
   if (task->simdata->compute) {
               && (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;
   }
   } else {
     return task->simdata->computation_amount;
   }


@@ -274,17 +263,9 @@ double MSG_task_get_remaining_communication(m_task_t task)
 {
   xbt_assert0((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
 {
   xbt_assert0((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");

-
-  if(!task->simdata->comm){
-         DEBUG1("you are trying to retrive remaining information on a NULL action, assuming it is zero",
-                                 0);
-         return 0;
-  }else{
-         DEBUG1("calling SIMIX_communication_get_remains(%p)",
-                         task->simdata->comm);
-  }
-
-  return SIMIX_communication_get_remains(task->simdata->comm);
+  DEBUG1("calling SIMIX_req_communication_get_remains(%p)",
+         task->simdata->comm);
+  return SIMIX_req_comm_get_remains(task->simdata->comm);

 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING


@@ -296,9 +277,9 @@ int MSG_task_is_latency_bounded(m_task_t task)
 {
   xbt_assert0((task != NULL)
               && (task->simdata != NULL), "Invalid parameter");
 {
   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);
          task->simdata->comm);

-  return SIMIX_communication_is_latency_bounded(task->simdata->comm);
+  return SIMIX_req_comm_is_latency_bounded(task->simdata->comm);

 }
 #endif
 
 }
 #endif
 


@@ -329,6 +310,6 @@ void MSG_task_set_priority(m_task_t task, double priority)
 
   task->simdata->priority = 1 / priority;
   if (task->simdata->compute)
 
   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);

 }
 }