X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12e8471ecf53fc4993c26335996af9a78e5ca666..84d2d3a6df181355293ddc2bf72399d646a7fae9:/src/msg/host.c

diff --git a/src/msg/host.c b/src/msg/host.c
index f5cbf871e1..d1425a2cba 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -55,9 +55,7 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data)
   }
 
   SIMIX_req_host_set_data(workstation, host);
-
-  /* Update global variables */
-  xbt_fifo_unshift(msg_global->host, host);
+  xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host);
 
   return host;
 }
@@ -71,8 +69,8 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data)
  */
 MSG_error_t MSG_host_set_data(m_host_t host, void *data)
 {
-  xbt_assert0((host != NULL), "Invalid parameters");
-  xbt_assert0((host->data == NULL), "Data already set");
+  xbt_assert((host != NULL), "Invalid parameters");
+  xbt_assert((host->data == NULL), "Data already set");
 
   /* Assign data */
   host->data = data;
@@ -90,7 +88,7 @@ MSG_error_t MSG_host_set_data(m_host_t host, void *data)
 void *MSG_host_get_data(m_host_t host)
 {
 
-  xbt_assert0((host != NULL), "Invalid parameters");
+  xbt_assert((host != NULL), "Invalid parameters");
 
   /* Return data */
   return (host->data);
@@ -106,7 +104,7 @@ void *MSG_host_get_data(m_host_t host)
 const char *MSG_host_get_name(m_host_t host)
 {
 
-  xbt_assert0((host != NULL)
+  xbt_assert((host != NULL)
               && (host->simdata != NULL), "Invalid parameters");
 
   /* Return data */
@@ -122,29 +120,19 @@ m_host_t MSG_host_self(void)
   return MSG_process_get_host(MSG_process_self());
 }
 
-/*
- * Real function to destroy a host.
- * MSG_host_destroy is just  a front_end that also removes it from 
- * msg_global->host
+/** \ingroup m_host_management
+ *
+ * \brief Destroys a host
  */
 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");
+  xbt_assert((host != NULL), "Invalid parameters");
 
-  /* Clean Simulator data */
-  /* SIMIX host will be cleaned when MSG_clean calls SIMIX_clean */
+  /* Clean simulator data */
   simdata = (host)->simdata;
 
-  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);
 
@@ -153,8 +141,6 @@ void __MSG_host_destroy(m_host_t host)
   /* Clean host structure */
   free(host->name);
   free(host);
-
-
 }
 
 /** \ingroup m_host_management
@@ -162,7 +148,7 @@ void __MSG_host_destroy(m_host_t host)
  */
 int MSG_get_host_number(void)
 {
-  return (xbt_fifo_size(msg_global->host));
+  return host_lib->count;
 }
 
 /** \ingroup m_host_management
@@ -170,7 +156,23 @@ int MSG_get_host_number(void)
  */
 m_host_t *MSG_get_host_table(void)
 {
-  return ((m_host_t *) xbt_fifo_to_array(msg_global->host));
+      void **array;
+	  int i = 0;
+	  xbt_lib_cursor_t cursor;
+	  char *key;
+	  void **data;
+
+	  if (host_lib->count == 0)
+		return NULL;
+	  else
+		array = xbt_new0(void *, host_lib->count);
+
+	  xbt_lib_foreach(host_lib, cursor, key, data) {
+	    if(get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST)
+	    	array[i++] = data[MSG_HOST_LEVEL];
+	  }
+
+	  return (m_host_t *)array;
 }
 
 /** \ingroup m_host_management
@@ -179,8 +181,8 @@ m_host_t *MSG_get_host_table(void)
  */
 int MSG_get_host_msgload(m_host_t h)
 {
-  xbt_assert0((h != NULL), "Invalid parameters");
-  xbt_assert0(0, "Not implemented yet");
+  xbt_assert((h != NULL), "Invalid parameters");
+  xbt_die( "Not implemented yet");
 
   return (0);
 }
@@ -191,7 +193,7 @@ int MSG_get_host_msgload(m_host_t h)
  */
 double MSG_get_host_speed(m_host_t h)
 {
-  xbt_assert0((h != NULL), "Invalid parameters");
+  xbt_assert((h != NULL), "Invalid parameters");
 
   return (SIMIX_req_host_get_speed(h->simdata->smx_host));
 }
@@ -216,7 +218,7 @@ const char *MSG_host_get_property_value(m_host_t host, const char *name)
  */
 xbt_dict_t MSG_host_get_properties(m_host_t host)
 {
-  xbt_assert0((host != NULL), "Invalid parameters (host is NULL)");
+  xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
 
   return (SIMIX_req_host_get_properties(host->simdata->smx_host));
 }
@@ -229,6 +231,6 @@ xbt_dict_t MSG_host_get_properties(m_host_t host)
  */
 int MSG_host_is_avail(m_host_t h)
 {
-  xbt_assert0((h != NULL), "Invalid parameters (host is NULL)");
+  xbt_assert((h != NULL), "Invalid parameters (host is NULL)");
   return (SIMIX_req_host_get_state(h->simdata->smx_host));
 }