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
Fix the commit introducing MSG_task_ref by actually introducing it, not only its...
[simgrid.git]
/
src
/
msg
/
task.c
diff --git
a/src/msg/task.c
b/src/msg/task.c
index
dea7d9b
..
8aae84d
100644
(file)
--- a/
src/msg/task.c
+++ b/
src/msg/task.c
@@
-47,7
+47,7
@@
* \return The new corresponding object.
*/
m_task_t MSG_task_create(const char *name, double compute_duration,
* \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);
{
m_task_t task = xbt_new(s_m_task_t, 1);
simdata_task_t simdata = xbt_new(s_simdata_task_t, 1);
@@
-61,7
+61,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->message_size = message_size;
simdata->rate = -1.0;
simdata->priority = 1.0;
- simdata->
using
= 1;
+ simdata->
refcount
= 1;
simdata->sender = NULL;
simdata->receiver = NULL;
simdata->cond = SIMIX_cond_init();
simdata->sender = NULL;
simdata->receiver = NULL;
simdata->cond = SIMIX_cond_init();
@@
-76,6
+76,11
@@
m_task_t MSG_task_create(const char *name, double compute_duration,
return task;
}
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.
*
/** \ingroup m_task_management
* \brief Return the user data of a #m_task_t.
*
@@
-135,8
+140,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? */
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->
using
--;
- if (task->simdata->
using
> 0)
+ task->simdata->
refcount
--;
+ if (task->simdata->
refcount
> 0)
return MSG_OK;
if (task->name)
return MSG_OK;
if (task->name)
@@
-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->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);
/* 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) {
return MSG_OK;
}
if (task->simdata->comm) {
- SIMIX_
ac
tion_cancel(task->simdata->comm);
+ SIMIX_
communica
tion_cancel(task->simdata->comm);
return MSG_OK;
}
return MSG_OK;
}
-
- return MSG_FATAL;
+ THROW_IMPOSSIBLE;
}
/** \ingroup m_task_management
}
/** \ingroup m_task_management
@@
-191,7
+193,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)
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;
}
return task->simdata->computation_amount;
}
@@
-203,7
+205,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)
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);
if (task->simdata->compute) {
return SIMIX_action_get_remains(task->simdata->compute);
@@
-221,9
+223,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)
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_
ac
tion_get_remains(task->simdata->comm);
+ return SIMIX_
communica
tion_get_remains(task->simdata->comm);
}
/** \ingroup m_task_management
}
/** \ingroup m_task_management
@@
-233,7
+235,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)
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;
}
return task->simdata->message_size;
}
@@
-249,10
+251,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)
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 = 1 / priority;
if (task->simdata->compute)
SIMIX_action_set_priority(task->simdata->compute,
- task->simdata->priority);
+
task->simdata->priority);
}
}