-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
int i;
char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
- if (msg_global->max_channel > 0)
- priv->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel);
+ priv->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);
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;
}
*/
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
xbt_dict_free(&priv->affinity_mask_db);
#ifdef MSG_USE_DEPRECATED
- if (msg_global->max_channel > 0)
- free(priv->mailboxes);
+ free(priv->mailboxes);
#endif
free(priv);
* \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 dynar containing all storages (name) attached to the host
+ */
+xbt_dynar_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
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);