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

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index c5440ab9cd..e7f2714292 100644
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -38,8 +38,8 @@ msg_host_t __MSG_host_create(smx_host_t workstation)
   int i;
   char alias[MAX_ALIAS_NAME + 1] = { 0 };       /* buffer used to build the key of the mailbox */
 
-  if (msg_global->max_channel > 0)
-    host->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel);
+  host->mailboxes = (msg_global->max_channel > 0) ?
+    xbt_new0(msg_mailbox_t, msg_global->max_channel) : NULL;
 
   for (i = 0; i < msg_global->max_channel; i++) {
     sprintf(alias, "%s:%d", name, i);
@@ -120,8 +120,7 @@ msg_host_t MSG_host_self(void)
 void __MSG_host_destroy(msg_host_priv_t host) {
 
 #ifdef MSG_USE_DEPRECATED
-  if (msg_global->max_channel > 0)
-    free(host->mailboxes);
+  free(host->mailboxes);
 #endif
   if (xbt_swag_size(host->vms) > 0 ) {
     XBT_VERB("Host shut down, but it still hosts %d VMs. They will be leaked.",xbt_swag_size(host->vms));
@@ -339,11 +338,11 @@ double MSG_get_host_consumed_energy(msg_host_t host) {
 }
 
 /** \ingroup m_host_management
- * \brief Return the list of mounted storages on an host.
+ * \brief Return the list of mount point names on an host.
  * \param host a host
- * \return a dynar containing all storages mounted on the host
+ * \return a dict containing all mount point on the host (mount_name => msg_storage_t)
  */
-xbt_dynar_t MSG_host_get_storage_list(msg_host_t host)
+xbt_dict_t MSG_host_get_storage_list(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters");
   return (simcall_host_get_storage_list(host));
@@ -352,20 +351,24 @@ xbt_dynar_t MSG_host_get_storage_list(msg_host_t host)
 /** \ingroup msg_host_management
  * \brief Return the content of mounted storages on an host.
  * \param host a host
- * \return a dynar containing content (as a dict) of all storages mounted on the host
+ * \return a dict containing content (as a dict) of all storages mounted on the host
  */
-xbt_dynar_t MSG_host_get_storage_content(msg_host_t host)
+xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters");
-  xbt_dynar_t contents = xbt_dynar_new(sizeof(void *),NULL);
+  xbt_dict_t contents = xbt_dict_new_homogeneous(NULL);
   msg_storage_t storage;
   char* storage_name;
-  unsigned int i;
-  xbt_dynar_t storage_list = simcall_host_get_storage_list(host);
-  xbt_dynar_foreach(storage_list, i, storage_name){
-	storage = xbt_lib_get_elm_or_null(storage_lib,storage_name);
-	xbt_dict_t content = simcall_storage_get_content(storage);
-	xbt_dynar_push(contents, &content);
+  char* mount_name;
+  xbt_dict_cursor_t cursor = NULL;
+
+  xbt_dict_t storage_list = simcall_host_get_storage_list(host);
+
+  xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
+    storage = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib,storage_name);
+    xbt_dict_t content = simcall_storage_get_content(storage);
+    xbt_dict_set(contents,mount_name, content,NULL);
   }
+  xbt_dict_free(&storage_list);
   return contents;
 }