#include "msg/msg_mailbox.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "simgrid/simix.h"
/** @addtogroup m_host_management
* \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Hosts" --> \endhtmlonly
*/
/********************************* Host **************************************/
-m_host_t __MSG_host_create(smx_host_t workstation, void *data)
+m_host_t __MSG_host_create(smx_host_t workstation)
{
- const char *name;
- simdata_host_t simdata = xbt_new0(s_simdata_host_t, 1);
+ 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);
- host->simdata = simdata;
- host->data = data;
-
- simdata->smx_host = workstation;
+ host->smx_host = workstation;
#ifdef MSG_USE_DEPRECATED
int i;
char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
if (msg_global->max_channel > 0)
- simdata->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel);
+ host->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel);
for (i = 0; i < msg_global->max_channel; i++) {
sprintf(alias, "%s:%d", name, i);
/* the key of the mailbox (in this case) is build from the name of the host and the channel number */
- simdata->mailboxes[i] = MSG_mailbox_new(alias);
+ host->mailboxes[i] = MSG_mailbox_new(alias);
memset(alias, 0, MAX_ALIAS_NAME + 1);
}
#endif
- simcall_host_set_data(workstation, host);
xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host);
return host;
}
+/** \ingroup msg_host_management
+ * \brief Finds a m_host_t using its name.
+ *
+ * This is a name directory service
+ * \param name the name of an host.
+ * \return the corresponding host
+ */
+m_host_t MSG_get_host_by_name(const char *name)
+{
+ 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.
*/
MSG_error_t MSG_host_set_data(m_host_t host, void *data)
{
- xbt_assert((host != NULL), "Invalid parameters");
- xbt_assert((host->data == NULL), "Data already set");
-
- /* Assign data */
- host->data = data;
+ SIMIX_host_set_data(host->smx_host,data);
return MSG_OK;
}
*/
void *MSG_host_get_data(m_host_t host)
{
-
- xbt_assert((host != NULL), "Invalid parameters");
-
- /* Return data */
- return (host->data);
+ return SIMIX_host_get_data(host->smx_host);
}
/** \ingroup m_host_management
* 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)
-{
-
- xbt_assert((host != NULL)
- && (host->simdata != NULL), "Invalid parameters");
-
- /* 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)
-{
- simdata_host_t simdata = NULL;
-
- xbt_assert((host != NULL), "Invalid parameters");
-
- /* Clean simulator data */
- simdata = (host)->simdata;
+void __MSG_host_destroy(m_host_t host) {
#ifdef MSG_USE_DEPRECATED
if (msg_global->max_channel > 0)
- free(simdata->mailboxes);
+ free(host->mailboxes);
#endif
- free(simdata);
-
- /* Clean host structure */
- free(host->name);
free(host);
}
{
xbt_assert((h != NULL), "Invalid parameters");
- return (simcall_host_get_speed(h->simdata->smx_host));
+ return (simcall_host_get_speed(h->smx_host));
}
/** \ingroup m_host_management
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return (simcall_host_get_properties(host->simdata->smx_host));
+ return (simcall_host_get_properties(host->smx_host));
}
/** \ingroup msg_gos_functions
* \brief Determine if a host is available.
*
- * \param h host to test
+ * \param host host to test
+ * \return Returns 1 if host is available, 0 otherwise
*/
-int MSG_host_is_avail(m_host_t h)
+int MSG_host_is_avail(m_host_t host)
{
- xbt_assert((h != NULL), "Invalid parameters (host is NULL)");
- return (simcall_host_get_state(h->simdata->smx_host));
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+ return (simcall_host_get_state(host->smx_host));
}