X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6fb08b9c6e18c4fc9d654b581996840ddab93608..28519cd452a15d8603b6594c634c6bfda3aa0538:/src/msg/task.c

diff --git a/src/msg/task.c b/src/msg/task.c
index 89f3cdb7b7..73476e8cf9 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -23,6 +23,15 @@
  *  <em>message size</em> and some <em>private data</em>.
  */
 
+#ifdef HAVE_RUBY                /* FIXME: KILLME */
+XBT_LOG_EXTERNAL_CATEGORY(ruby);
+#endif
+
+
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg,
+                                "Logging specific to MSG (task)");
+
 /********************************* Task **************************************/
 /** \ingroup m_task_management
  * \brief Creates a new #m_task_t.
@@ -71,7 +80,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   simdata->comp_amount = NULL;
   simdata->comm_amount = NULL;
 #ifdef HAVE_TRACING
-  TRACE_msg_task_create (task);
+  TRACE_msg_task_create(task);
 #endif
 
   return task;
@@ -96,7 +105,7 @@ void *MSG_task_get_data(m_task_t task)
  * This function allows to associate a new pointer to
    the user data associated of \a task.
  */
-void MSG_task_set_data(m_task_t task,void *data)
+void MSG_task_set_data(m_task_t task, void *data)
 {
   xbt_assert0((task != NULL), "Invalid parameter");
 
@@ -136,6 +145,22 @@ const char *MSG_task_get_name(m_task_t task)
   return task->name;
 }
 
+/** \ingroup m_task_management
+ * \brief Return the name of a #m_task_t.
+ *
+ * This functions allows to associate a name to a task
+ */
+void MSG_task_set_name(m_task_t task, const char *name)
+{
+  xbt_assert0(task, "Invalid parameters");
+  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.
@@ -153,7 +178,7 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   if (task->simdata->refcount > 0)
     return MSG_OK;
 #ifdef HAVE_TRACING
-  TRACE_msg_task_destroy (task);
+  TRACE_msg_task_destroy(task);
 #endif
 
   if (task->name)
@@ -165,7 +190,7 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   action = task->simdata->compute;
   if (action)
     SIMIX_action_destroy(action);
-  
+
   /* parallel tasks only */
   if (task->simdata->host_list)
     xbt_free(task->simdata->host_list);
@@ -210,6 +235,19 @@ double MSG_task_get_compute_duration(m_task_t task)
   return task->simdata->computation_amount;
 }
 
+
+/** \ingroup m_task_management
+ * \brief set the computation amount needed to process a task #m_task_t.
+ */
+
+void MSG_task_set_compute_duration(m_task_t task,
+                                   double computation_amount)
+{
+  xbt_assert0(task, "Invalid parameter");
+  task->simdata->computation_amount = computation_amount;
+
+}
+
 /** \ingroup m_task_management
  * \brief Returns the remaining computation amount of a task #m_task_t.
  *
@@ -226,20 +264,43 @@ 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");
 
+  if(!task->simdata->comm){
+	  DEBUG0("you are trying to retrive remaining information on a NULL action, assuming it is zero");
+	  return 0;
+  }else{
+	  DEBUG1("calling SIMIX_communication_get_remains(%p)",
+			  task->simdata->comm);
+  }
+
   return SIMIX_communication_get_remains(task->simdata->comm);
 }
 
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+/** \ingroup m_task_management
+ * \brief Return 1 if communication task is limited by latency, 0 otherwise
+ *
+ */
+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)",
+         task->simdata->comm);
+  return SIMIX_communication_is_latency_bounded(task->simdata->comm);
+}
+#endif
+
 /** \ingroup m_task_management
  * \brief Returns the size of the data attached to a task #m_task_t.
  *
@@ -270,5 +331,3 @@ void MSG_task_set_priority(m_task_t task, double priority)
     SIMIX_action_set_priority(task->simdata->compute,
                               task->simdata->priority);
 }
-
-