X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb91af44a1bd7e5f331686df25d5fe80ff571a43..461406a7de84177863ce0d70fa8017a147ca9990:/src/msg/msg_host.c

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index a683d423bb..bb33cfc369 100644
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -8,6 +8,9 @@
 #include "msg/msg_mailbox.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "simgrid/simix.h"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
 
 /** @addtogroup m_host_management
  *     \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Hosts" --> \endhtmlonly
@@ -27,8 +30,10 @@ m_host_t __MSG_host_create(smx_host_t workstation)
 {
   const char *name = SIMIX_host_get_name(workstation);
   m_host_t host = xbt_new0(s_m_host_t, 1);
+  s_msg_vm_t vm; // simply to compute the offset
 
   host->smx_host = workstation;
+  host->vms = xbt_swag_new(xbt_swag_offset(vm,host_vms_hookup));
 
 #ifdef MSG_USE_DEPRECATED
   int i;
@@ -109,8 +114,7 @@ m_host_t MSG_host_self(void)
   return MSG_process_get_host(NULL);
 }
 
-/** \ingroup m_host_management
- *
+/*
  * \brief Destroys a host (internal call only)
  */
 void __MSG_host_destroy(m_host_t host) {
@@ -119,7 +123,11 @@ void __MSG_host_destroy(m_host_t host) {
   if (msg_global->max_channel > 0)
     free(host->mailboxes);
 #endif
-
+  if (xbt_swag_size(host->vms) > 0 ) {
+    XBT_VERB("Host %s shut down, but it still hosts %d VMs. They will be leaked.",
+        MSG_host_get_name(host),xbt_swag_size(host->vms));
+  }
+  xbt_swag_free(host->vms);
   free(host);
 }
 
@@ -132,22 +140,22 @@ int MSG_get_host_number(void)
 m_host_t *MSG_get_host_table(void)
 {
       void **array;
-	  int i = 0;
-	  xbt_lib_cursor_t cursor;
-	  char *key;
-	  void **data;
-
-	  if (xbt_lib_length(host_lib) == 0)
-		return NULL;
-	  else
-		array = xbt_new0(void *, xbt_lib_length(host_lib));
-
-	  xbt_lib_foreach(host_lib, cursor, key, data) {
-	    if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST)
-	    	array[i++] = data[MSG_HOST_LEVEL];
-	  }
-
-	  return (m_host_t *)array;
+    int i = 0;
+    xbt_lib_cursor_t cursor;
+    char *key;
+    void **data;
+
+    if (xbt_lib_length(host_lib) == 0)
+    return NULL;
+    else
+    array = xbt_new0(void *, xbt_lib_length(host_lib));
+
+    xbt_lib_foreach(host_lib, cursor, key, data) {
+      if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST)
+        array[i++] = data[MSG_HOST_LEVEL];
+    }
+
+    return (m_host_t *)array;
 }
 #endif
 
@@ -215,6 +223,19 @@ xbt_dict_t MSG_host_get_properties(m_host_t host)
   return (simcall_host_get_properties(host->smx_host));
 }
 
+/** \ingroup m_host_management
+ * \brief Change the value of a given host property
+ *
+ * \param host a host
+ * \param name a property name
+ * \param value what to change the property to
+ * \param free_ctn the freeing function to use to kill the value on need
+ */
+void MSG_host_set_property_value(m_host_t host, const char *name, char *value,void_f_pvoid_t free_ctn) {
+
+  xbt_dict_set(MSG_host_get_properties(host), name, value,free_ctn);
+}
+
 
 /** \ingroup msg_gos_functions
  * \brief Determine if a host is available.