X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a24e5e842b10085c859c6988099e815964db2eda..06cc65bdf3c37c0a55e182b582d0ff5710df4f26:/src/msg/task.c
diff --git a/src/msg/task.c b/src/msg/task.c
index cc85717242..877467c1cd 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)");
@@ -92,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,7 +99,7 @@ void *MSG_task_get_data(m_task_t task)
*/
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;
}
@@ -117,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;
}
@@ -128,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;
}
@@ -139,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,7 +144,7 @@ const char *MSG_task_get_name(m_task_t task)
*/
void MSG_task_set_name(m_task_t task, const char *name)
{
- xbt_assert0(task, "Invalid parameters");
+ xbt_assert(task, "Invalid parameters");
task->name = xbt_strdup(name);
}
@@ -163,25 +157,24 @@ void MSG_task_set_name(m_task_t task, const char *name)
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? */
- if (task->simdata->isused > 0)
- return MSG_OK;
+ if (task->simdata->isused) {
+ /* the task is still being used, it may be an unfinished dsend */
+ MSG_task_cancel(task);
+ }
#ifdef HAVE_TRACING
TRACE_msg_task_destroy(task);
#endif
- if (task->name)
- free(task->name);
+ xbt_free(task->name);
action = task->simdata->compute;
if (action)
SIMIX_req_host_execution_destroy(action);
/* parallel tasks only */
- if (task->simdata->host_list)
- xbt_free(task->simdata->host_list);
+ xbt_free(task->simdata->host_list);
/* free main structures */
xbt_free(task->simdata);
@@ -193,22 +186,21 @@ MSG_error_t MSG_task_destroy(m_task_t task)
/** \ingroup m_task_management
* \brief Cancel a #m_task_t.
- * \param task the taskt to cancel. If it was executed or transfered, it
+ * \param task the task to cancel. If it was executed or transfered, it
stops the process that were working on it.
*/
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_req_host_execution_cancel(task->simdata->compute);
- return MSG_OK;
}
- if (task->simdata->comm) {
+ else if (task->simdata->comm) {
SIMIX_req_comm_cancel(task->simdata->comm);
- return MSG_OK;
+ task->simdata->isused = 0;
}
- THROW_IMPOSSIBLE;
+ return MSG_OK;
}
/** \ingroup m_task_management
@@ -217,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)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
return task->simdata->computation_amount;
@@ -231,7 +223,7 @@ double MSG_task_get_compute_duration(m_task_t task)
void MSG_task_set_compute_duration(m_task_t task,
double computation_amount)
{
- xbt_assert0(task, "Invalid parameter");
+ xbt_assert(task, "Invalid parameter");
task->simdata->computation_amount = computation_amount;
}
@@ -242,7 +234,7 @@ void MSG_task_set_compute_duration(m_task_t task,
*/
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) {
@@ -260,9 +252,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)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
- DEBUG1("calling SIMIX_req_communication_get_remains(%p)",
+ XBT_DEBUG("calling SIMIX_req_communication_get_remains(%p)",
task->simdata->comm);
return SIMIX_req_comm_get_remains(task->simdata->comm);
}
@@ -274,9 +266,9 @@ double MSG_task_get_remaining_communication(m_task_t task)
*/
int MSG_task_is_latency_bounded(m_task_t task)
{
- xbt_assert0((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
- DEBUG1("calling SIMIX_req_communication_is_latency_bounded(%p)",
+ XBT_DEBUG("calling SIMIX_req_communication_is_latency_bounded(%p)",
task->simdata->comm);
return SIMIX_req_comm_is_latency_bounded(task->simdata->comm);
}
@@ -288,7 +280,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;
@@ -304,7 +296,7 @@ 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;