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

diff --git a/src/msg/task.c b/src/msg/task.c
index 8dd6016b3e..01bd7e00ed 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -1,8 +1,5 @@
-/*     $Id$      */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
-/* Copyright (c) 2007 Bruno Donassolo.                                      */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -30,6 +27,11 @@
 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.
@@ -61,6 +63,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   task->data = data;
 
   /* Simulator Data */
+  simdata->host_nb = 0;
   simdata->computation_amount = compute_duration;
   simdata->message_size = message_size;
   simdata->rate = -1.0;
@@ -76,9 +79,8 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   simdata->host_list = NULL;
   simdata->comp_amount = NULL;
   simdata->comm_amount = NULL;
-
-#ifdef HAVE_RUBY /* FIXME: KILLME */
-  CINFO2(ruby,"Created task %p: %s",task,name);
+#ifdef HAVE_TRACING
+  TRACE_msg_task_create (task);
 #endif
 
   return task;
@@ -87,7 +89,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
 /** \ingroup m_task_management
  * \brief Return the user data of a #m_task_t.
  *
- * This functions checks whether \a task is a valid pointer or not and return
+ * This function checks whether \a task is a valid pointer or not and return
    the user data associated to \a task if it is possible.
  */
 void *MSG_task_get_data(m_task_t task)
@@ -97,6 +99,19 @@ void *MSG_task_get_data(m_task_t task)
   return (task->data);
 }
 
+/** \ingroup m_task_management
+ * \brief Sets the user data of a #m_task_t.
+ *
+ * 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)
+{
+  xbt_assert0((task != NULL), "Invalid parameter");
+
+  task->data = data;
+}
+
 /** \ingroup m_task_management
  * \brief Return the sender of a #m_task_t.
  *
@@ -130,6 +145,10 @@ const char *MSG_task_get_name(m_task_t task)
   return task->name;
 }
 
+void MSG_task_refcount_dec(m_task_t task)
+{
+  task->simdata->refcount--;
+}
 
 /** \ingroup m_task_management
  * \brief Destroy a #m_task_t.
@@ -146,6 +165,9 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   task->simdata->refcount--;
   if (task->simdata->refcount > 0)
     return MSG_OK;
+#ifdef HAVE_TRACING
+  TRACE_msg_task_destroy (task);
+#endif
 
   if (task->name)
     free(task->name);
@@ -186,8 +208,7 @@ MSG_error_t MSG_task_cancel(m_task_t task)
     SIMIX_communication_cancel(task->simdata->comm);
     return MSG_OK;
   }
-
-  return MSG_FATAL;
+  THROW_IMPOSSIBLE;
 }
 
 /** \ingroup m_task_management
@@ -218,8 +239,6 @@ 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.
  *
@@ -228,10 +247,22 @@ 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)", task->simdata->comm);
   return SIMIX_communication_get_remains(task->simdata->comm);
 }
 
+/** \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);
+}
+
 /** \ingroup m_task_management
  * \brief Returns the size of the data attached to a task #m_task_t.
  *
@@ -262,3 +293,5 @@ void MSG_task_set_priority(m_task_t task, double priority)
     SIMIX_action_set_priority(task->simdata->compute,
                               task->simdata->priority);
 }
+
+