A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cancelling a non-running task: show a warning only once
[simgrid.git]
/
src
/
msg
/
task.c
diff --git
a/src/msg/task.c
b/src/msg/task.c
index
cc85717
..
2a9a5c0
100644
(file)
--- a/
src/msg/task.c
+++ b/
src/msg/task.c
@@
-23,12
+23,6
@@
* <em>message size</em> and some <em>private data</em>.
*/
* <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)");
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)
{
*/
void *MSG_task_get_data(m_task_t task)
{
- xbt_assert
0
((task != NULL), "Invalid parameter");
+ xbt_assert((task != NULL), "Invalid parameter");
return (task->data);
}
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)
{
*/
void MSG_task_set_data(m_task_t task, void *data)
{
- xbt_assert
0
((task != NULL), "Invalid parameter");
+ xbt_assert((task != NULL), "Invalid parameter");
task->data = data;
}
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)
{
*/
m_process_t MSG_task_get_sender(m_task_t task)
{
- xbt_assert
0
(task, "Invalid parameters");
+ xbt_assert(task, "Invalid parameters");
return ((simdata_task_t) task->simdata)->sender;
}
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)
{
*/
m_host_t MSG_task_get_source(m_task_t task)
{
- xbt_assert
0
(task, "Invalid parameters");
+ xbt_assert(task, "Invalid parameters");
return ((simdata_task_t) task->simdata)->source;
}
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)
{
*/
const char *MSG_task_get_name(m_task_t task)
{
- xbt_assert
0
(task, "Invalid parameters");
+ xbt_assert(task, "Invalid parameters");
return task->name;
}
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)
{
*/
void MSG_task_set_name(m_task_t task, const char *name)
{
- xbt_assert
0
(task, "Invalid parameters");
+ xbt_assert(task, "Invalid parameters");
task->name = xbt_strdup(name);
}
task->name = xbt_strdup(name);
}
@@
-163,11
+157,13
@@
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;
MSG_error_t MSG_task_destroy(m_task_t task)
{
smx_action_t action = NULL;
- xbt_assert
0
((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? */
/* 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)
+ if (task->simdata->isused > 0) {
+ XBT_DEBUG("Cannot destroy task %p since somebody is using it", task);
return MSG_OK;
return MSG_OK;
+ }
#ifdef HAVE_TRACING
TRACE_msg_task_destroy(task);
#endif
#ifdef HAVE_TRACING
TRACE_msg_task_destroy(task);
#endif
@@
-193,22
+189,27
@@
MSG_error_t MSG_task_destroy(m_task_t task)
/** \ingroup m_task_management
* \brief Cancel a #m_task_t.
/** \ingroup m_task_management
* \brief Cancel a #m_task_t.
- * \param task the task
t 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)
{
stops the process that were working on it.
*/
MSG_error_t MSG_task_cancel(m_task_t task)
{
- xbt_assert
0
((task != NULL), "Invalid parameter");
+ xbt_assert((task != NULL), "Invalid parameter");
if (task->simdata->compute) {
SIMIX_req_host_execution_cancel(task->simdata->compute);
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);
SIMIX_req_comm_cancel(task->simdata->comm);
- return MSG_OK;
}
}
- THROW_IMPOSSIBLE;
+ else {
+ static int warned = 0;
+ if (!warned) {
+ XBT_WARN("Cannot cancel a non-running task");
+ warned = 1;
+ }
+ }
+ return MSG_OK;
}
/** \ingroup m_task_management
}
/** \ingroup m_task_management
@@
-217,7
+218,7
@@
MSG_error_t MSG_task_cancel(m_task_t task)
*/
double MSG_task_get_compute_duration(m_task_t task)
{
*/
double MSG_task_get_compute_duration(m_task_t task)
{
- xbt_assert
0
((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
return task->simdata->computation_amount;
&& (task->simdata != NULL), "Invalid parameter");
return task->simdata->computation_amount;
@@
-231,7
+232,7
@@
double MSG_task_get_compute_duration(m_task_t task)
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_assert
0
(task, "Invalid parameter");
+ xbt_assert(task, "Invalid parameter");
task->simdata->computation_amount = computation_amount;
}
task->simdata->computation_amount = computation_amount;
}
@@
-242,7
+243,7
@@
void MSG_task_set_compute_duration(m_task_t task,
*/
double MSG_task_get_remaining_computation(m_task_t task)
{
*/
double MSG_task_get_remaining_computation(m_task_t task)
{
- xbt_assert
0
((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
if (task->simdata->compute) {
&& (task->simdata != NULL), "Invalid parameter");
if (task->simdata->compute) {
@@
-260,9
+261,9
@@
double MSG_task_get_remaining_computation(m_task_t task)
*/
double MSG_task_get_remaining_communication(m_task_t task)
{
*/
double MSG_task_get_remaining_communication(m_task_t task)
{
- xbt_assert
0
((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
&& (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);
}
task->simdata->comm);
return SIMIX_req_comm_get_remains(task->simdata->comm);
}
@@
-274,9
+275,9
@@
double MSG_task_get_remaining_communication(m_task_t task)
*/
int MSG_task_is_latency_bounded(m_task_t task)
{
*/
int MSG_task_is_latency_bounded(m_task_t task)
{
- xbt_assert
0
((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
&& (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);
}
task->simdata->comm);
return SIMIX_req_comm_is_latency_bounded(task->simdata->comm);
}
@@
-288,7
+289,7
@@
int MSG_task_is_latency_bounded(m_task_t task)
*/
double MSG_task_get_data_size(m_task_t task)
{
*/
double MSG_task_get_data_size(m_task_t task)
{
- xbt_assert
0
((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
return task->simdata->message_size;
&& (task->simdata != NULL), "Invalid parameter");
return task->simdata->message_size;
@@
-304,7
+305,7
@@
double MSG_task_get_data_size(m_task_t task)
*/
void MSG_task_set_priority(m_task_t task, double priority)
{
*/
void MSG_task_set_priority(m_task_t task, double priority)
{
- xbt_assert
0
((task != NULL)
+ xbt_assert((task != NULL)
&& (task->simdata != NULL), "Invalid parameter");
task->simdata->priority = 1 / priority;
&& (task->simdata != NULL), "Invalid parameter");
task->simdata->priority = 1 / priority;