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
Stop using SMX host->data to store MSG host
[simgrid.git]
/
src
/
msg
/
msg_host.c
diff --git
a/src/msg/msg_host.c
b/src/msg/msg_host.c
index
40d0ef4
..
a683d42
100644
(file)
--- a/
src/msg/msg_host.c
+++ b/
src/msg/msg_host.c
@@
-25,13
+25,9
@@
/********************************* Host **************************************/
m_host_t __MSG_host_create(smx_host_t workstation)
{
/********************************* Host **************************************/
m_host_t __MSG_host_create(smx_host_t workstation)
{
- const char *name;
+ const char *name
= SIMIX_host_get_name(workstation)
;
m_host_t host = xbt_new0(s_m_host_t, 1);
m_host_t host = xbt_new0(s_m_host_t, 1);
- name = SIMIX_host_get_name(workstation);
- /* Host structure */
- host->name = xbt_strdup(name);
-
host->smx_host = workstation;
#ifdef MSG_USE_DEPRECATED
host->smx_host = workstation;
#ifdef MSG_USE_DEPRECATED
@@
-50,7
+46,6
@@
m_host_t __MSG_host_create(smx_host_t workstation)
}
#endif
}
#endif
- simcall_host_set_data(workstation, host);
xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host);
return host;
xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host);
return host;
@@
-65,16
+60,9
@@
m_host_t __MSG_host_create(smx_host_t workstation)
*/
m_host_t MSG_get_host_by_name(const char *name)
{
*/
m_host_t MSG_get_host_by_name(const char *name)
{
- smx_host_t simix_h = NULL;
- simix_h = simcall_host_get_by_name(name);
-
- if (simix_h == NULL)
- return NULL;
-
- return (m_host_t) simcall_host_get_data(simix_h);
+ return (m_host_t) xbt_lib_get_or_null(host_lib,name,MSG_HOST_LEVEL);
}
}
-
/** \ingroup m_host_management
*
* \brief Set the user data of a #m_host_t.
/** \ingroup m_host_management
*
* \brief Set the user data of a #m_host_t.
@@
-98,7
+86,6
@@
MSG_error_t MSG_host_set_data(m_host_t host, void *data)
*/
void *MSG_host_get_data(m_host_t host)
{
*/
void *MSG_host_get_data(m_host_t host)
{
-
return SIMIX_host_get_data(host->smx_host);
}
return SIMIX_host_get_data(host->smx_host);
}
@@
-109,11
+96,8
@@
void *MSG_host_get_data(m_host_t host)
* This functions checks whether \a host is a valid pointer or not and return
its name.
*/
* This functions checks whether \a host is a valid pointer or not and return
its name.
*/
-const char *MSG_host_get_name(m_host_t host)
-{
-
- /* Return data */
- return (host->name);
+const char *MSG_host_get_name(m_host_t host) {
+ return SIMIX_host_get_name(host->smx_host);
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-127,22
+111,15
@@
m_host_t MSG_host_self(void)
/** \ingroup m_host_management
*
/** \ingroup m_host_management
*
- * \brief Destroys a host
+ * \brief Destroys a host
(internal call only)
*/
*/
-void __MSG_host_destroy(m_host_t host)
-{
-
- xbt_assert((host != NULL), "Invalid parameters");
-
- /* Clean simulator data */
+void __MSG_host_destroy(m_host_t host) {
#ifdef MSG_USE_DEPRECATED
if (msg_global->max_channel > 0)
free(host->mailboxes);
#endif
#ifdef MSG_USE_DEPRECATED
if (msg_global->max_channel > 0)
free(host->mailboxes);
#endif
- /* Clean host structure */
- free(host->name);
free(host);
}
free(host);
}