* <em>message size</em> and some <em>private data</em>.
*/
-#ifdef HAVE_RUBY /* FIXME: KILLME */
-XBT_LOG_EXTERNAL_CATEGORY(ruby);
-#endif
-
-
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg,
"Logging specific to MSG (task)");
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->compute = NULL;
*/
void *MSG_task_get_data(m_task_t task)
{
- xbt_assert0((task != NULL), "Invalid parameter");
+ xbt_assert((task != NULL), "Invalid parameter");
return (task->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;
}
*/
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;
}
*/
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;
}
*/
const char *MSG_task_get_name(m_task_t task)
{
- xbt_assert0(task, "Invalid parameters");
+ xbt_assert(task, "Invalid parameters");
return task->name;
}
*/
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);
}
-
-void MSG_task_refcount_dec(m_task_t task)
-{
- task->simdata->refcount--;
-}
-
/** \ingroup m_task_management
* \brief Destroy a #m_task_t.
*
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)
- 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);
/** \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
*/
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;
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;
}
*/
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) {
*/
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);
}
*/
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);
}
*/
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;
*/
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;