X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8963831bbd6c10389bc103e579afe2d632262d95..a06e616da86a22a21a02fcc9ddaf192cecdef2bc:/src/msg/task.c
diff --git a/src/msg/task.c b/src/msg/task.c
index 0d6cd42727..8dd6016b3e 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -26,6 +26,10 @@
* message size and some private data.
*/
+#ifdef HAVE_RUBY /* FIXME: KILLME */
+XBT_LOG_EXTERNAL_CATEGORY(ruby);
+#endif
+
/********************************* Task **************************************/
/** \ingroup m_task_management
* \brief Creates a new #m_task_t.
@@ -47,7 +51,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);
@@ -61,7 +65,7 @@ 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->refcount = 1;
simdata->sender = NULL;
simdata->receiver = NULL;
simdata->cond = SIMIX_cond_init();
@@ -73,6 +77,10 @@ m_task_t MSG_task_create(const char *name, double compute_duration,
simdata->comp_amount = NULL;
simdata->comm_amount = NULL;
+#ifdef HAVE_RUBY /* FIXME: KILLME */
+ CINFO2(ruby,"Created task %p: %s",task,name);
+#endif
+
return task;
}
@@ -135,8 +143,8 @@ 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)
+ task->simdata->refcount--;
+ if (task->simdata->refcount > 0)
return MSG_OK;
if (task->name)
@@ -148,9 +156,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,7 +183,7 @@ 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;
}
@@ -191,7 +197,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 +209,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 +227,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 +239,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 +255,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);
+ task->simdata->priority);
}