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

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index 682b07ec07..cb9dd4883b 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
@@ -339,11 +339,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));
@@ -354,18 +354,31 @@ xbt_dynar_t MSG_host_get_storage_list(msg_host_t host)
  * \param host a host
  * \return a dynar 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();
+
   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 = SIMIX_storage_get_content(storage);
-//	xbt_dynar_push(contents, &content);
+  char* mount_name;
+  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor2 = NULL;
+  char* file;
+  size_t size;
+
+  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_INFO("mount name => %s", mount_name);
+	xbt_dict_t content = simcall_storage_get_content(storage);
+    xbt_dict_foreach(content,cursor2,file,size){
+      XBT_INFO("\t\t%s size: %zu bytes", file, size);
+    }
+
+	xbt_dict_set(contents,mount_name,(void *)content,NULL);
   }
   return contents;
 }