X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b070d7cc294509944f728b688883fbc05db17346..836c888a9f8c7be6a2ec571a2f838c76a7df1a40:/src/msg/msg_host.c

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index b2a53eb2af..ce32fdf887 100644
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -9,9 +9,6 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
-/** \defgroup m_host_management Management functions of Hosts
- *  \brief This section describes the host structure of MSG
- */
 /** @addtogroup m_host_management
  *     \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Hosts" --> \endhtmlonly
  * (#m_host_t) and the functions for managing it.
@@ -62,6 +59,25 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data)
   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)
+{
+  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);
+}
+
+
 /** \ingroup m_host_management
  *
  * \brief Set the user data of a #m_host_t.
@@ -147,17 +163,12 @@ void __MSG_host_destroy(m_host_t host)
   free(host);
 }
 
-/** \ingroup m_host_management
- * \brief Return the current number of #m_host_t.
- */
+#ifdef MSG_USE_DEPRECATED
 int MSG_get_host_number(void)
 {
   return xbt_lib_length(host_lib);
 }
 
-/** \ingroup m_host_management
- * \brief Return a array of all the #m_host_t.
- */
 m_host_t *MSG_get_host_table(void)
 {
       void **array;
@@ -178,6 +189,23 @@ m_host_t *MSG_get_host_table(void)
 
 	  return (m_host_t *)array;
 }
+#endif
+
+/** \ingroup m_host_management
+ * \brief Return a dynar containing all the hosts declared at a given point of time
+ */
+xbt_dynar_t MSG_hosts_as_dynar(void) {
+  xbt_lib_cursor_t cursor;
+  char *key;
+  void **data;
+  xbt_dynar_t res = xbt_dynar_new(sizeof(m_host_t),NULL);
+
+  xbt_lib_foreach(host_lib, cursor, key, data) {
+    if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST)
+      xbt_dynar_push(res, data + MSG_HOST_LEVEL);
+  }
+  return res;
+}
 
 /** \ingroup m_host_management
  * \brief Return the number of MSG tasks currently running on a
@@ -231,10 +259,11 @@ xbt_dict_t MSG_host_get_properties(m_host_t 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->simdata->smx_host));
 }