X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8963831bbd6c10389bc103e579afe2d632262d95..a24e5e842b10085c859c6988099e815964db2eda:/src/msg/task.c
diff --git a/src/msg/task.c b/src/msg/task.c
index 0d6cd42727..cc85717242 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 @@
* message size and some private data.
*/
+#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.
@@ -47,7 +53,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,21 +63,23 @@ 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->refcount = 1;
+ simdata->isused = 0;
simdata->sender = NULL;
simdata->receiver = NULL;
- simdata->cond = SIMIX_cond_init();
- simdata->mutex = SIMIX_mutex_init();
simdata->compute = NULL;
simdata->comm = NULL;
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 +87,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 +97,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 +143,16 @@ 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);
+}
/** \ingroup m_task_management
* \brief Destroy a #m_task_t.
@@ -135,22 +166,19 @@ 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->refcount --;
- if (task->simdata->refcount > 0)
+ if (task->simdata->isused > 0)
return MSG_OK;
+#ifdef HAVE_TRACING
+ TRACE_msg_task_destroy(task);
+#endif
if (task->name)
free(task->name);
- SIMIX_cond_destroy(task->simdata->cond);
- SIMIX_mutex_destroy(task->simdata->mutex);
-
action = task->simdata->compute;
if (action)
- SIMIX_action_destroy(action);
- action = task->simdata->comm;
- if (action)
- SIMIX_action_destroy(action);
+ SIMIX_req_host_execution_destroy(action);
+
/* parallel tasks only */
if (task->simdata->host_list)
xbt_free(task->simdata->host_list);
@@ -173,15 +201,14 @@ MSG_error_t MSG_task_cancel(m_task_t task)
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) {
- SIMIX_action_cancel(task->simdata->comm);
+ SIMIX_req_comm_cancel(task->simdata->comm);
return MSG_OK;
}
-
- return MSG_FATAL;
+ THROW_IMPOSSIBLE;
}
/** \ingroup m_task_management
@@ -191,11 +218,24 @@ 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;
}
+
+/** \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.
*
@@ -203,28 +243,44 @@ 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);
+ return SIMIX_req_host_execution_get_remains(task->simdata->compute);
} else {
return task->simdata->computation_amount;
}
}
-
-
/** \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");
+ && (task->simdata != NULL), "Invalid parameter");
+ DEBUG1("calling SIMIX_req_communication_get_remains(%p)",
+ task->simdata->comm);
+ return SIMIX_req_comm_get_remains(task->simdata->comm);
+}
- return SIMIX_action_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_req_communication_is_latency_bounded(%p)",
+ task->simdata->comm);
+ return SIMIX_req_comm_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.
@@ -233,7 +289,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 +305,10 @@ 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);
+ SIMIX_req_host_execution_set_priority(task->simdata->compute,
+ task->simdata->priority);
}