Add "attach" attribute to storage tag in platform description

[simgrid.git] / src / msg / msg_host.c

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index 670f820..57fd96c 100644 (file)
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -72,17 +72,17 @@ msg_host_t MSG_get_host_by_name(const char *name)
   return (msg_host_t) xbt_lib_get_elm_or_null(host_lib,name);
 }
 
+static const char *msg_data = "data";
 /** \ingroup m_host_management
  *
  * \brief Set the user data of a #msg_host_t.
  *
- * This functions checks whether some data has already been associated to \a host 
+ * This functions checks whether some data has already been associated to \a host
    or not and attach \a data to \a host if it is possible.
  */
 msg_error_t MSG_host_set_data(msg_host_t host, void *data)
 {
-  SIMIX_host_set_data(host,data);
-
+  MSG_host_set_property_value(host, msg_data, data, NULL);
   return MSG_OK;
 }
 
@@ -95,7 +95,7 @@ msg_error_t MSG_host_set_data(msg_host_t host, void *data)
  */
 void *MSG_host_get_data(msg_host_t host)
 {
-  return SIMIX_host_get_data(host);
+  return (void *)MSG_host_get_property_value(host, msg_data);
 }
 
 /** \ingroup m_host_management
@@ -402,10 +402,21 @@ double MSG_get_host_consumed_energy(msg_host_t host) {
  * \param host a host
  * \return a dict containing all mount point on the host (mount_name => msg_storage_t)
  */
-xbt_dict_t MSG_host_get_storage_list(msg_host_t host)
+xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host)
+{
+  xbt_assert((host != NULL), "Invalid parameters");
+  return (simcall_host_get_mounted_storage_list(host));
+}
+
+/** \ingroup m_host_management
+ * \brief Return the list of storages attached to an host.
+ * \param host a host
+ * \return a dict containing all storages attached to the host (storage name => msg_storage_t)
+ */
+xbt_dict_t MSG_host_get_attached_storage_list(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters");
-  return (simcall_host_get_storage_list(host));
+  return (simcall_host_get_attached_storage_list(host));
 }
 
 /** \ingroup msg_host_management
@@ -422,7 +433,7 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
   char* mount_name;
   xbt_dict_cursor_t cursor = NULL;
 
-  xbt_dict_t storage_list = simcall_host_get_storage_list(host);
+  xbt_dict_t storage_list = simcall_host_get_mounted_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);