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 remaining memory leaks in MSG
[simgrid.git]
/
src
/
msg
/
gos.c
diff --git
a/src/msg/gos.c
b/src/msg/gos.c
index
2143286
..
cb6c929
100644
(file)
--- a/
src/msg/gos.c
+++ b/
src/msg/gos.c
@@
-43,14
+43,14
@@
MSG_error_t MSG_task_execute(m_task_t task)
simdata = task->simdata;
simdata = task->simdata;
- xbt_assert
0
(simdata->host_nb == 0,
+ xbt_assert(simdata->host_nb == 0,
"This is a parallel task. Go to hell.");
#ifdef HAVE_TRACING
TRACE_msg_task_execute_start(task);
#endif
"This is a parallel task. Go to hell.");
#ifdef HAVE_TRACING
TRACE_msg_task_execute_start(task);
#endif
- xbt_assert
1
((!simdata->compute) && (task->simdata->isused == 0),
+ xbt_assert((!simdata->compute) && (task->simdata->isused == 0),
"This task is executed somewhere else. Go fix your code! %d",
task->simdata->isused);
"This task is executed somewhere else. Go fix your code! %d",
task->simdata->isused);
@@
-173,11
+173,11
@@
MSG_error_t MSG_parallel_task_execute(m_task_t task)
simdata = task->simdata;
p_simdata = SIMIX_process_self_get_data();
simdata = task->simdata;
p_simdata = SIMIX_process_self_get_data();
- xbt_assert
0
((!simdata->compute)
+ xbt_assert((!simdata->compute)
&& (task->simdata->isused == 0),
"This task is executed somewhere else. Go fix your code!");
&& (task->simdata->isused == 0),
"This task is executed somewhere else. Go fix your code!");
- xbt_assert
0
(simdata->host_nb,
+ xbt_assert(simdata->host_nb,
"This is not a parallel task. Go to hell.");
XBT_DEBUG("Parallel computing on %s", p_simdata->m_host->name);
"This is not a parallel task. Go to hell.");
XBT_DEBUG("Parallel computing on %s", p_simdata->m_host->name);
@@
-331,7
+331,7
@@
MSG_error_t
MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout,
m_host_t host)
{
MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout,
m_host_t host)
{
- xbt_assert
1
((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
@@
-414,7
+414,7
@@
XBT_INLINE msg_comm_t MSG_task_isend_with_matching(m_task_t task, const char *al
t_simdata->sender = process;
t_simdata->source = MSG_host_self();
t_simdata->sender = process;
t_simdata->source = MSG_host_self();
- xbt_assert
0
(t_simdata->isused == 0,
+ xbt_assert(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
t_simdata->isused = 1;
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
t_simdata->isused = 1;
@@
-437,8
+437,8
@@
XBT_INLINE msg_comm_t MSG_task_isend_with_matching(m_task_t task, const char *al
* \brief Sends a task on a mailbox.
*
* This is a non blocking detached send function.
* \brief Sends a task on a mailbox.
*
* This is a non blocking detached send function.
- * Think of it as a best effort send. The
communication
- *
object will be destroyed by the receiver (if any)
.
+ * Think of it as a best effort send. The
task should
+ *
be destroyed by the receiver
.
*
* \param task a #m_task_t to send on another location.
* \param alias name of the mailbox to sent the task to
*
* \param task a #m_task_t to send on another location.
* \param alias name of the mailbox to sent the task to
@@
-465,7
+465,7
@@
void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup)
t_simdata->sender = process;
t_simdata->source = MSG_host_self();
t_simdata->sender = process;
t_simdata->source = MSG_host_self();
- xbt_assert
0
(t_simdata->isused == 0,
+ xbt_assert(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
t_simdata->isused = 1;
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
t_simdata->isused = 1;
@@
-486,16
+486,16
@@
void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup)
* \param name of the mailbox to receive the task on
* \return the msg_comm_t communication created
*/
* \param name of the mailbox to receive the task on
* \return the msg_comm_t communication created
*/
-msg_comm_t MSG_task_irecv(m_task_t *task, const char *
alias
)
+msg_comm_t MSG_task_irecv(m_task_t *task, const char *
name
)
{
{
- smx_rdv_t rdv = MSG_mailbox_get_by_alias(
alias
);
+ smx_rdv_t rdv = MSG_mailbox_get_by_alias(
name
);
CHECK_HOST();
/* FIXME: these functions are not tracable */
/* Sanity check */
CHECK_HOST();
/* FIXME: these functions are not tracable */
/* Sanity check */
- xbt_assert
0
(task, "Null pointer for the task storage");
+ xbt_assert(task, "Null pointer for the task storage");
if (*task)
XBT_CRITICAL
if (*task)
XBT_CRITICAL
@@
-623,9
+623,7
@@
void MSG_comm_destroy(msg_comm_t comm)
(*comm->task_received)->simdata->isused = 0;
}
(*comm->task_received)->simdata->isused = 0;
}
- /* FIXME auto-destroy comms from SIMIX to avoid this request */
- /*SIMIX_req_comm_destroy(comm->s_comm);*/
- free(comm);
+ xbt_free(comm);
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
@@
-731,7
+729,7
@@
int MSG_comm_waitany(xbt_dynar_t comms)
xbt_ex_free(e);
}
xbt_ex_free(e);
}
- xbt_assert
0
(finished_index != -1, "WaitAny returned -1");
+ xbt_assert(finished_index != -1, "WaitAny returned -1");
xbt_dynar_free(&s_comms);
comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t);
xbt_dynar_free(&s_comms);
comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t);
@@
-755,7
+753,7
@@
MSG_error_t MSG_comm_get_status(msg_comm_t comm) {
m_task_t MSG_comm_get_task(msg_comm_t comm)
{
m_task_t MSG_comm_get_task(msg_comm_t comm)
{
- xbt_assert
0
(comm, "Invalid parameter");
+ xbt_assert(comm, "Invalid parameter");
return comm->task_received ? *comm->task_received : comm->task_sent;
}
return comm->task_received ? *comm->task_received : comm->task_sent;
}
@@
-838,7
+836,7
@@
MSG_error_t
MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
m_channel_t channel, double timeout)
{
MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
m_channel_t channel, double timeout)
{
- xbt_assert
1
((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
@@
-889,7
+887,7
@@
int MSG_task_listen(const char *alias)
*/
int MSG_task_Iprobe(m_channel_t channel)
{
*/
int MSG_task_Iprobe(m_channel_t channel)
{
- xbt_assert
1
((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
@@
-915,7
+913,7
@@
int MSG_task_Iprobe(m_channel_t channel)
*/
int MSG_task_probe_from_host(int channel, m_host_t host)
{
*/
int MSG_task_probe_from_host(int channel, m_host_t host)
{
- xbt_assert
1
((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
@@
-952,7
+950,7
@@
int MSG_task_probe_from(m_channel_t channel)
CHECK_HOST();
CHECK_HOST();
- xbt_assert
1
((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);