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

diff --git a/src/msg/task.c b/src/msg/task.c
index 05a1a3e907..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. */
@@ -26,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.
@@ -57,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;
@@ -79,11 +86,6 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
   return task;
 }
 
-/** prevent the task from being destroyed too quickly (but also prevent it from being sent). Mainly useful in bindings */
-void MSG_task_ref(m_task_t t) {
-  t->simdata->refcount++;
-}
-
 /** \ingroup m_task_management
  * \brief Return the user data of a #m_task_t.
  *
@@ -143,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.
@@ -233,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.
  *
@@ -243,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.
  *
@@ -279,16 +295,3 @@ void MSG_task_set_priority(m_task_t task, double priority)
 }
 
 
-/** \ingroup m_task_management
- * \brief Sets the user data of a #m_task_t.
- *
- * This function allows to test if a task contains a not_null data
- * return 1 (if true)
- */
-int MSG_task_has_data(m_task_t task)
-{
-
- return (task->data != NULL);
-
-}
-