#include "msg/private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "mailbox.h"
/** \defgroup m_host_management Management functions of Hosts
* \brief This section describes the host structure of MSG
m_host_t host = xbt_new0(s_m_host_t, 1);
int i;
+ char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
+
name = SIMIX_host_get_name(workstation);
/* Host structure */
host->name = xbt_strdup(name);
simdata->smx_host = workstation;
- simdata->mbox = xbt_new0(xbt_fifo_t, msg_global->max_channel);
- for (i = 0; i < msg_global->max_channel; i++)
- simdata->mbox[i] = xbt_fifo_new();
+ if (msg_global->max_channel > 0)
+ simdata->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_create(alias);
+ memset(alias, 0, MAX_ALIAS_NAME + 1);
+ }
- simdata->sleeping = xbt_new0(smx_cond_t, msg_global->max_channel);
simdata->mutex = SIMIX_mutex_init();
SIMIX_host_set_data(workstation, host);
{
xbt_assert0((host != NULL)
- && (host->simdata != NULL), "Invalid parameters");
+ && (host->simdata != NULL), "Invalid parameters");
/* Return data */
return (host->name);
{
simdata_host_t simdata = NULL;
int i = 0;
+ char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
xbt_assert0((host != NULL), "Invalid parameters");
/* SIMIX host will be cleaned when MSG_clean calls SIMIX_clean */
simdata = (host)->simdata;
- for (i = 0; i < msg_global->max_channel; i++)
- xbt_fifo_free(simdata->mbox[i]);
- free(simdata->mbox);
- free(simdata->sleeping);
+ for (i = 0; i < msg_global->max_channel; i++) {
+ sprintf(alias, "%s:%d", host->name, i);
+ MSG_mailbox_free((void *) (simdata->mailboxes[i]));
+ memset(alias, 0, MAX_ALIAS_NAME + 1);
+ }
+
+ if (msg_global->max_channel > 0)
+ free(simdata->mailboxes);
SIMIX_mutex_destroy(simdata->mutex);
free(simdata);
free(host->name);
free(host);
- return;
+
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
- * \brief Returns the value of a certain host property
+ * \brief Returns the value of a given host property
*
* \param host a host
* \param name a property name
- * \return value of a property
+ * \return value of a property (or NULL if property not set)
*/
-const char* MSG_host_get_property_value(m_host_t host, char* name)
+const char *MSG_host_get_property_value(m_host_t host, const char *name)
{
return xbt_dict_get_or_null(MSG_host_get_properties(host), name);
}