X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..bedb146ef83e4a0bdac371c42a9ced9e06b9d800:/src/msg/msg_host.c diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c index 5c2eec831c..1f36f3b5af 100644 --- a/src/msg/msg_host.c +++ b/src/msg/msg_host.c @@ -51,6 +51,7 @@ msg_host_t __MSG_host_create(smx_host_t workstation) priv->dp_objs = xbt_dict_new(); priv->dp_enabled = 0; priv->dp_updated_by_deleted_tasks = 0; + priv->is_migrating = 0; priv->affinity_mask_db = xbt_dict_new_homogeneous(NULL); @@ -306,17 +307,25 @@ void MSG_host_set_property_value(msg_host_t host, const char *name, char *value, } -/** \ingroup msg_gos_functions - * \brief Determine if a host is available. +/** @ingroup msg_gos_functions + * @brief Determine if a host is up and running. * - * \param host host to test - * \return Returns 1 if host is available, 0 otherwise + * @param host host to test + * @return Returns true if the host is up and running, and false if it's currently down */ -int MSG_host_is_avail(msg_host_t host) +int MSG_host_is_on(msg_host_t host) { xbt_assert((host != NULL), "Invalid parameters (host is NULL)"); return (simcall_host_get_state(host)); } +/** @ingroup msg_gos_functions + * @brief Determine if a host is currently off. + */ +int MSG_host_is_off(msg_host_t host) +{ + xbt_assert((host != NULL), "Invalid parameters (host is NULL)"); + return !(simcall_host_get_state(host)); +} /** \ingroup m_host_management * \brief Set the parameters of a given host @@ -402,10 +411,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 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 @@ -422,7 +442,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);