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 segfault at end of simulation.
[simgrid.git]
/
src
/
msg
/
msg_host.c
diff --git
a/src/msg/msg_host.c
b/src/msg/msg_host.c
index
9e45fce
..
dc2e25d
100644
(file)
--- a/
src/msg/msg_host.c
+++ b/
src/msg/msg_host.c
@@
-35,8
+35,8
@@
msg_host_t __MSG_host_create(smx_host_t workstation)
int i;
char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
int i;
char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
- if (msg_global->max_channel > 0)
-
priv->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel)
;
+ priv->mailboxes = (msg_global->max_channel > 0) ?
+
xbt_new0(msg_mailbox_t, msg_global->max_channel) : NULL
;
for (i = 0; i < msg_global->max_channel; i++) {
sprintf(alias, "%s:%d", name, i);
for (i = 0; i < msg_global->max_channel; i++) {
sprintf(alias, "%s:%d", name, i);
@@
-147,8
+147,7
@@
void __MSG_host_priv_free(msg_host_priv_t priv)
xbt_dict_free(&priv->affinity_mask_db);
#ifdef MSG_USE_DEPRECATED
xbt_dict_free(&priv->affinity_mask_db);
#ifdef MSG_USE_DEPRECATED
- if (msg_global->max_channel > 0)
- free(priv->mailboxes);
+ free(priv->mailboxes);
#endif
free(priv);
#endif
free(priv);
@@
-318,15
+317,16
@@
int MSG_host_is_avail(msg_host_t host)
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
return (simcall_host_get_state(host));
}
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
return (simcall_host_get_state(host));
}
+
/** \ingroup m_host_management
* \brief Set the parameters of a given host
*
* \param host a host
* \param params a prameter object
*/
/** \ingroup m_host_management
* \brief Set the parameters of a given host
*
* \param host a host
* \param params a prameter object
*/
-void MSG_host_set_params(msg_host_t
ind_pm
, ws_params_t params)
+void MSG_host_set_params(msg_host_t
host
, ws_params_t params)
{
{
- simcall_host_set_params(
ind_pm
, params);
+ simcall_host_set_params(
host
, params);
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-335,9
+335,9
@@
void MSG_host_set_params(msg_host_t ind_pm, ws_params_t params)
* \param host a host
* \param params a prameter object
*/
* \param host a host
* \param params a prameter object
*/
-void MSG_host_get_params(msg_host_t
ind_pm
, ws_params_t params)
+void MSG_host_get_params(msg_host_t
host
, ws_params_t params)
{
{
- simcall_host_get_params(
ind_pm
, params);
+ simcall_host_get_params(
host
, params);
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management