X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed1c81fc9bce2480dd944490032c7336ba68a19a..9e8d76f5eb3db584150db55fc3929623188b6b08:/src/msg/task.c
diff --git a/src/msg/task.c b/src/msg/task.c
index 144494a1a1..2908b353fe 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -23,12 +23,6 @@
* 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)");
@@ -68,11 +62,9 @@ m_task_t MSG_task_create(const char *name, double 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;
@@ -80,7 +72,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
simdata->comp_amount = NULL;
simdata->comm_amount = NULL;
#ifdef HAVE_TRACING
- TRACE_msg_task_create (task);
+ TRACE_msg_task_create(task);
#endif
return task;
@@ -94,7 +86,7 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
*/
void *MSG_task_get_data(m_task_t task)
{
- xbt_assert0((task != NULL), "Invalid parameter");
+ xbt_assert((task != NULL), "Invalid parameter");
return (task->data);
}
@@ -105,9 +97,9 @@ void *MSG_task_get_data(m_task_t task)
* 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)
+void MSG_task_set_data(m_task_t task, void *data)
{
- xbt_assert0((task != NULL), "Invalid parameter");
+ xbt_assert((task != NULL), "Invalid parameter");
task->data = data;
}
@@ -119,7 +111,7 @@ void MSG_task_set_data(m_task_t task,void *data)
*/
m_process_t MSG_task_get_sender(m_task_t task)
{
- xbt_assert0(task, "Invalid parameters");
+ xbt_assert(task, "Invalid parameters");
return ((simdata_task_t) task->simdata)->sender;
}
@@ -130,7 +122,7 @@ 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");
+ xbt_assert(task, "Invalid parameters");
return ((simdata_task_t) task->simdata)->source;
}
@@ -141,7 +133,7 @@ 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");
+ xbt_assert(task, "Invalid parameters");
return task->name;
}
@@ -150,16 +142,10 @@ const char *MSG_task_get_name(m_task_t task)
*
* This functions allows to associate a name to a task
*/
-void MSG_task_set_name(m_task_t task,const char* name)
+void MSG_task_set_name(m_task_t task, const char *name)
{
- xbt_assert0(task,"Invalid parameters");
- task->name = xbt_strdup(name);
-}
-
-
-void MSG_task_refcount_dec(m_task_t task)
-{
- task->simdata->refcount--;
+ xbt_assert(task, "Invalid parameters");
+ task->name = xbt_strdup(name);
}
/** \ingroup m_task_management
@@ -171,26 +157,24 @@ void MSG_task_refcount_dec(m_task_t task)
MSG_error_t MSG_task_destroy(m_task_t task)
{
smx_action_t action = NULL;
- xbt_assert0((task != NULL), "Invalid parameter");
+ xbt_assert((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) {
+ XBT_DEBUG("Cannot destroy task %p since somebody is using it", task);
return MSG_OK;
+ }
#ifdef HAVE_TRACING
- TRACE_msg_task_destroy (task);
+ 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);
-
+ SIMIX_req_host_execution_destroy(action);
+
/* parallel tasks only */
if (task->simdata->host_list)
xbt_free(task->simdata->host_list);
@@ -210,14 +194,14 @@ MSG_error_t MSG_task_destroy(m_task_t task)
*/
MSG_error_t MSG_task_cancel(m_task_t task)
{
- xbt_assert0((task != NULL), "Invalid parameter");
+ xbt_assert((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_communication_cancel(task->simdata->comm);
+ SIMIX_req_comm_cancel(task->simdata->comm);
return MSG_OK;
}
THROW_IMPOSSIBLE;
@@ -229,7 +213,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)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
return task->simdata->computation_amount;
@@ -240,23 +224,25 @@ double MSG_task_get_compute_duration(m_task_t task)
* \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)
+void MSG_task_set_compute_duration(m_task_t task,
+ double computation_amount)
{
- xbt_assert0(task,"Invalid parameter");
- task->simdata->computation_amount = computation_amount;
+ xbt_assert(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)
+ xbt_assert((task != NULL)
&& (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;
}
@@ -264,27 +250,33 @@ 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.
- *
+ * 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)
+ xbt_assert((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);
+ XBT_DEBUG("calling SIMIX_req_communication_get_remains(%p)",
+ task->simdata->comm);
+ return SIMIX_req_comm_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_communication_is_latency_bounded(%p)", task->simdata->comm);
- return SIMIX_communication_is_latency_bounded(task->simdata->comm);
+ xbt_assert((task != NULL)
+ && (task->simdata != NULL), "Invalid parameter");
+ XBT_DEBUG("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.
@@ -292,7 +284,7 @@ int MSG_task_is_latency_bounded(m_task_t task)
*/
double MSG_task_get_data_size(m_task_t task)
{
- xbt_assert0((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
return task->simdata->message_size;
@@ -308,13 +300,11 @@ 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)
+ xbt_assert((task != NULL)
&& (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);
}
-
-