Add an example for waitany fct.

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

diff --git a/src/msg/task.c b/src/msg/task.c
index dea7d9b..3479e47 100644 (file)
--- 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. */
@@ -47,7 +44,7 @@
  * \return The new corresponding object.
  */
 m_task_t MSG_task_create(const char *name, double compute_duration,
-                        double message_size, void *data)
+                         double message_size, void *data)
 {
   m_task_t task = xbt_new(s_m_task_t, 1);
   simdata_task_t simdata = xbt_new(s_simdata_task_t, 1);
@@ -57,11 +54,12 @@ 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;
   simdata->priority = 1.0;
-  simdata->using = 1;
+  simdata->refcount = 1;
   simdata->sender = NULL;
   simdata->receiver = NULL;
   simdata->cond = SIMIX_cond_init();
@@ -72,6 +70,9 @@ 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_TRACING
+  TRACE_msg_task_create (task);
+#endif
 
   return task;
 }
@@ -79,7 +80,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)
@@ -89,6 +90,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.
  *
@@ -122,6 +136,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.
@@ -135,9 +153,12 @@ 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->using--;
-  if (task->simdata->using > 0)
+  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);
@@ -148,9 +169,7 @@ MSG_error_t MSG_task_destroy(m_task_t task)
   action = task->simdata->compute;
   if (action)
     SIMIX_action_destroy(action);
-  action = task->simdata->comm;
-  if (action)
-    SIMIX_action_destroy(action);
+  
   /* parallel tasks only */
   if (task->simdata->host_list)
     xbt_free(task->simdata->host_list);
@@ -177,11 +196,10 @@ MSG_error_t MSG_task_cancel(m_task_t task)
     return MSG_OK;
   }
   if (task->simdata->comm) {
-    SIMIX_action_cancel(task->simdata->comm);
+    SIMIX_communication_cancel(task->simdata->comm);
     return MSG_OK;
   }
-
-  return MSG_FATAL;
+  THROW_IMPOSSIBLE;
 }
 
 /** \ingroup m_task_management
@@ -191,7 +209,7 @@ MSG_error_t MSG_task_cancel(m_task_t task)
 double MSG_task_get_compute_duration(m_task_t task)
 {
   xbt_assert0((task != NULL)
-             && (task->simdata != NULL), "Invalid parameter");
+              && (task->simdata != NULL), "Invalid parameter");
 
   return task->simdata->computation_amount;
 }
@@ -203,7 +221,7 @@ double MSG_task_get_compute_duration(m_task_t task)
 double MSG_task_get_remaining_computation(m_task_t task)
 {
   xbt_assert0((task != NULL)
-             && (task->simdata != NULL), "Invalid parameter");
+              && (task->simdata != NULL), "Invalid parameter");
 
   if (task->simdata->compute) {
     return SIMIX_action_get_remains(task->simdata->compute);
@@ -221,9 +239,9 @@ double MSG_task_get_remaining_computation(m_task_t task)
 double MSG_task_get_remaining_communication(m_task_t task)
 {
   xbt_assert0((task != NULL)
-             && (task->simdata != NULL), "Invalid parameter");
+              && (task->simdata != NULL), "Invalid parameter");
 
-  return SIMIX_action_get_remains(task->simdata->comm);
+  return SIMIX_communication_get_remains(task->simdata->comm);
 }
 
 /** \ingroup m_task_management
@@ -233,7 +251,7 @@ double MSG_task_get_remaining_communication(m_task_t task)
 double MSG_task_get_data_size(m_task_t task)
 {
   xbt_assert0((task != NULL)
-             && (task->simdata != NULL), "Invalid parameter");
+              && (task->simdata != NULL), "Invalid parameter");
 
   return task->simdata->message_size;
 }
@@ -249,10 +267,12 @@ double MSG_task_get_data_size(m_task_t task)
 void MSG_task_set_priority(m_task_t task, double priority)
 {
   xbt_assert0((task != NULL)
-             && (task->simdata != NULL), "Invalid parameter");
+              && (task->simdata != NULL), "Invalid parameter");
 
   task->simdata->priority = 1 / priority;
   if (task->simdata->compute)
     SIMIX_action_set_priority(task->simdata->compute,
-                             task->simdata->priority);
+                              task->simdata->priority);
 }
+
+