#include "msg/msg_mailbox.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "simgrid/simix.h"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
/** @addtogroup m_host_management
* \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Hosts" --> \endhtmlonly
/********************************* 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);
-
- name = SIMIX_host_get_name(workstation);
- /* Host structure */
- host->name = xbt_strdup(name);
+ s_msg_vm_t vm; // simply to compute the offset
host->smx_host = workstation;
+ host->vms = xbt_swag_new(xbt_swag_offset(vm,host_vms_hookup));
#ifdef MSG_USE_DEPRECATED
int i;
}
#endif
- simcall_host_set_data(workstation, host);
xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host);
return host;
*/
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.
*/
void *MSG_host_get_data(m_host_t host)
{
-
return SIMIX_host_get_data(host->smx_host);
}
* 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
*
- * \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
-
- /* Clean host structure */
- free(host->name);
+ if (xbt_swag_size(host->vms) > 0 ) {
+ XBT_VERB("Host %s shut down, but it still hosts %d VMs. They will be leaked.",
+ MSG_host_get_name(host),xbt_swag_size(host->vms));
+ }
+ xbt_swag_free(host->vms);
free(host);
}