X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da7e15623cc3e43bd5b30848b1b2283af9470b5c..094c97e3586d1703f0d01e539b2570b535ccbe2b:/src/msg/task.c
diff --git a/src/msg/task.c b/src/msg/task.c
index b6c608a871..88c743da21 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -1,20 +1,20 @@
-/* $Id$ */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. 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. */
-#include "private.h"
+#include "msg/private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(task, msg,
- "Logging specific to MSG (task)");
/** \defgroup m_task_management Managing functions of Tasks
* \brief This section describes the task structure of MSG
* (#m_task_t) and the functions for managing it.
- *
+ */
+/** @addtogroup m_task_management
+ * \htmlonly \endhtmlonly
+ *
* Since most scheduling algorithms rely on a concept of task
* that can be either computed locally or
* transferred on another processor, it seems to be the
@@ -23,6 +23,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(task, msg,
* 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.
@@ -31,10 +40,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(task, msg,
corresponding object.
* \param name a name for the object. It is for user-level information
and can be NULL.
- * \param compute_duration a value of the processing amount (in Mflop)
+ * \param compute_duration a value of the processing amount (in flop)
needed to process this new task. If 0, then it cannot be executed with
MSG_task_execute(). This value has to be >=0.
- * \param message_size a value of the amount of data (in Mb) needed to
+ * \param message_size a value of the amount of data (in bytes) needed to
transfer this new task. If 0, then it cannot be transfered with
MSG_task_get() and MSG_task_put(). This value has to be >=0.
* \param data a pointer to any data may want to attach to the new
@@ -44,24 +53,33 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(task, msg,
* \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)
{
- simdata_task_t simdata = xbt_new0(s_simdata_task_t,1);
- m_task_t task = xbt_new0(s_m_task_t,1);
-
+ m_task_t task = xbt_new(s_m_task_t, 1);
+ simdata_task_t simdata = xbt_new(s_simdata_task_t, 1);
+ task->simdata = simdata;
/* Task structure */
task->name = xbt_strdup(name);
- task->simdata = simdata;
task->data = data;
/* Simulator Data */
- simdata->sleeping = xbt_dynar_new(sizeof(m_process_t),NULL);
+ 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->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;
}
@@ -69,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)
@@ -79,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.
*
@@ -86,8 +117,8 @@ void *MSG_task_get_data(m_task_t task)
*/
m_process_t MSG_task_get_sender(m_task_t task)
{
- xbt_assert0(task, "Invalid parameters");
- return ((simdata_task_t) task->simdata)->sender;
+ xbt_assert0(task, "Invalid parameters");
+ return ((simdata_task_t) task->simdata)->sender;
}
/** \ingroup m_task_management
@@ -97,8 +128,8 @@ m_process_t MSG_task_get_sender(m_task_t task)
*/
m_host_t MSG_task_get_source(m_task_t task)
{
- xbt_assert0(task, "Invalid parameters");
- return ((simdata_task_t) task->simdata)->source;
+ xbt_assert0(task, "Invalid parameters");
+ return ((simdata_task_t) task->simdata)->source;
}
/** \ingroup m_task_management
@@ -108,10 +139,20 @@ m_host_t MSG_task_get_source(m_task_t task)
*/
const char *MSG_task_get_name(m_task_t task)
{
- xbt_assert0(task, "Invalid parameters");
- return task->name;
+ xbt_assert0(task, "Invalid parameters");
+ 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.
@@ -121,28 +162,31 @@ const char *MSG_task_get_name(m_task_t task)
*/
MSG_error_t MSG_task_destroy(m_task_t task)
{
- surf_action_t action = NULL;
-
+ smx_action_t action = NULL;
xbt_assert0((task != NULL), "Invalid parameter");
- task->simdata->using--;
- if(task->simdata->using>0) return MSG_OK;
-
- xbt_assert0((xbt_dynar_length(task->simdata->sleeping)==0),
- "Task still used. There is a problem. Cannot destroy it now!");
-
- if(task->name) free(task->name);
+ /* 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)
+ return MSG_OK;
+#ifdef HAVE_TRACING
+ TRACE_msg_task_destroy(task);
+#endif
- xbt_dynar_free(&(task->simdata->sleeping));
+ if (task->name)
+ free(task->name);
action = task->simdata->compute;
- if(action) action->resource_type->common_public->action_free(action);
- action = task->simdata->comm;
- if(action) action->resource_type->common_public->action_free(action);
- if(task->simdata->host_list) xbt_free(task->simdata->host_list);
+ if (action)
+ SIMIX_req_host_execution_destroy(action);
+
+ /* parallel tasks only */
+ if (task->simdata->host_list)
+ xbt_free(task->simdata->host_list);
- free(task->simdata);
- free(task);
+ /* free main structures */
+ xbt_free(task->simdata);
+ xbt_free(task);
return MSG_OK;
}
@@ -157,85 +201,115 @@ MSG_error_t MSG_task_cancel(m_task_t task)
{
xbt_assert0((task != NULL), "Invalid parameter");
- if(task->simdata->compute) {
- surf_workstation_resource->common_public->action_cancel(task->simdata->compute);
+ if (task->simdata->compute) {
+ SIMIX_req_host_execution_cancel(task->simdata->compute);
return MSG_OK;
}
- if(task->simdata->comm) {
- surf_workstation_resource->common_public->action_cancel(task->simdata->comm);
+ if (task->simdata->comm) {
+ SIMIX_req_comm_cancel(task->simdata->comm);
return MSG_OK;
}
-
- return MSG_FATAL;
+ THROW_IMPOSSIBLE;
}
/** \ingroup m_task_management
* \brief Returns the computation amount needed to process a task #m_task_t.
* Once a task has been processed, this amount is thus set to 0...
*/
-double MSG_task_get_compute_duration(m_task_t task) {
- xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
+double MSG_task_get_compute_duration(m_task_t task)
+{
+ xbt_assert0((task != NULL)
+ && (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.
*
*/
double MSG_task_get_remaining_computation(m_task_t task)
{
- xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
+ xbt_assert0((task != NULL)
+ && (task->simdata != NULL), "Invalid parameter");
- if(task->simdata->compute) {
- return task->simdata->compute->remains;
+ if (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 size of the data attached to a task #m_task_t.
- *
+ * \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_data_size(m_task_t task) {
- xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
-
- return task->simdata->message_size;
+double MSG_task_get_remaining_communication(m_task_t task)
+{
+ xbt_assert0((task != NULL)
+ && (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);
}
-MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task)
+#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)
{
- int _cursor;
- m_process_t proc = NULL;
-
- xbt_assert0(((task != NULL)
- && (task->simdata != NULL)), "Invalid parameters");
+ 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
- xbt_dynar_push(task->simdata->sleeping, &process);
- process->simdata->waiting_task = task;
- xbt_context_yield();
- process->simdata->waiting_task = NULL;
- xbt_dynar_foreach(task->simdata->sleeping,_cursor,proc) {
- if(proc==process)
- xbt_dynar_remove_at(task->simdata->sleeping,_cursor,&proc);
- }
+/** \ingroup m_task_management
+ * \brief Returns the size of the data attached to a task #m_task_t.
+ *
+ */
+double MSG_task_get_data_size(m_task_t task)
+{
+ xbt_assert0((task != NULL)
+ && (task->simdata != NULL), "Invalid parameter");
- return MSG_OK;
+ return task->simdata->message_size;
}
+
/** \ingroup m_task_management
* \brief Changes the priority of a computation task. This priority doesn't affect
* the transfer rate. A priority of 2 will make a task receive two times more
* cpu power than the other ones.
*
*/
-void MSG_task_set_priority(m_task_t task, double priority) {
- xbt_assert0((task != NULL) && (task->simdata != NULL), "Invalid parameter");
+void MSG_task_set_priority(m_task_t task, double priority)
+{
+ xbt_assert0((task != NULL)
+ && (task->simdata != NULL), "Invalid parameter");
- task->simdata->priority = 1/priority;
- if(task->simdata->compute)
- surf_workstation_resource->common_public->
- set_priority(task->simdata->compute, task->simdata->priority);
+ task->simdata->priority = 1 / priority;
+ if (task->simdata->compute)
+ SIMIX_req_host_execution_set_priority(task->simdata->compute,
+ task->simdata->priority);
}