Fix some conflicts with modifications introduced in the svn branch

[simgrid.git] / src / msg / host.c

diff --git a/src/msg/host.c b/src/msg/host.c
index f8f9cdf..2d2edd9 100644 (file)
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -10,6 +10,7 @@
 #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
@@ -35,19 +36,27 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data)
   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);
   host->simdata = simdata;
   host->data = data;
 
-  simdata->s_host = workstation;
+  simdata->smx_host = workstation;
+
+  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);
 
-  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();
+    /* 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);
 
@@ -102,7 +111,7 @@ const char *MSG_host_get_name(m_host_t host)
 {
 
   xbt_assert0((host != NULL)
-             && (host->simdata != NULL), "Invalid parameters");
+              && (host->simdata != NULL), "Invalid parameters");
 
   /* Return data */
   return (host->name);
@@ -126,6 +135,7 @@ void __MSG_host_destroy(m_host_t host)
 {
   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");
 
@@ -133,10 +143,14 @@ void __MSG_host_destroy(m_host_t host)
   /* 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);
 
@@ -144,7 +158,7 @@ void __MSG_host_destroy(m_host_t host)
   free(host->name);
   free(host);
 
-  return;
+
 }
 
 /** \ingroup m_host_management
@@ -183,9 +197,35 @@ double MSG_get_host_speed(m_host_t h)
 {
   xbt_assert0((h != NULL), "Invalid parameters");
 
-  return (SIMIX_host_get_speed(h->simdata->s_host));
+  return (SIMIX_host_get_speed(h->simdata->smx_host));
+}
+
+/** \ingroup m_host_management
+ * \brief Returns the value of a given host property
+ *
+ * \param host a host
+ * \param name a property name
+ * \return value of a property (or NULL if property not set)
+ */
+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);
+}
+
+/** \ingroup m_host_management
+ * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to this host
+ *
+ * \param host a host
+ * \return a dict containing the properties
+ */
+xbt_dict_t MSG_host_get_properties(m_host_t host)
+{
+  xbt_assert0((host != NULL), "Invalid parameters");
+
+  return (SIMIX_host_get_properties(host->simdata->smx_host));
 }
 
+
 /** \ingroup msg_gos_functions
  * \brief Determine if a host is available.
  *
@@ -194,5 +234,5 @@ double MSG_get_host_speed(m_host_t h)
 int MSG_host_is_avail(m_host_t h)
 {
   xbt_assert0((h != NULL), "Invalid parameters");
-  return (SIMIX_host_get_state(h->simdata->s_host));
+  return (SIMIX_host_get_state(h->simdata->smx_host));
 }