X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..06aaaaffb5ec865a880e32dcff6768792ce78446:/src/msg/task.c diff --git a/src/msg/task.c b/src/msg/task.c index 60082dc867..8aae84d883 100644 --- a/src/msg/task.c +++ b/src/msg/task.c @@ -76,6 +76,11 @@ m_task_t MSG_task_create(const char *name, double compute_duration, return task; } +/** prevent the task from being destroyed too quickly (but also prevent it from being sent). Mainly useful in bindings */ +void MSG_task_ref(m_task_t t) { + t->simdata->refcount++; +} + /** \ingroup m_task_management * \brief Return the user data of a #m_task_t. * @@ -148,9 +153,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,11 +180,10 @@ 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; } - - return MSG_FATAL; + THROW_IMPOSSIBLE; } /** \ingroup m_task_management @@ -223,7 +225,7 @@ double MSG_task_get_remaining_communication(m_task_t task) xbt_assert0((task != NULL) && (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