X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71ea76af2f6b151aaf1dc69eddee3cd47bafa5f0..1fc5e0b36dddadb1e7deec1428f526de70bdb016:/src/msg/msg_host.c
diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index ccfc8805e4..00e126cedb 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-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@ -13,7 +13,7 @@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
/** @addtogroup m_host_management
- * \htmlonly \endhtmlonly
+ * \htmlonly \endhtmlonly
* (#msg_host_t) and the functions for managing it.
*
* A location (or host) is any possible place where
@@ -35,8 +35,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)
- 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);
@@ -52,6 +52,8 @@ msg_host_t __MSG_host_create(smx_host_t workstation)
priv->dp_enabled = 0;
priv->dp_updated_by_deleted_tasks = 0;
+ priv->affinity_mask_db = xbt_dict_new_homogeneous(NULL);
+
xbt_lib_set(host_lib, name, MSG_HOST_LEVEL, priv);
return xbt_lib_get_elm_or_null(host_lib, name);
@@ -70,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;
}
@@ -93,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
@@ -142,10 +144,10 @@ void __MSG_host_priv_free(msg_host_priv_t priv)
if (size > 0)
XBT_WARN("dp_objs: %u pending task?", size);
xbt_dict_free(&priv->dp_objs);
+ 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);
@@ -239,15 +241,32 @@ double MSG_get_host_speed(msg_host_t h)
/** \ingroup m_host_management
- * \brief Return the number of core.
+ * \brief Return the number of cores.
+ *
+ * \param host a host
+ * \return the number of cores
*/
-int MSG_get_host_core(msg_host_t h)
+int MSG_host_get_core_number(msg_host_t host)
{
- xbt_assert((h != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
- return (simcall_host_get_core(h));
+ return (simcall_host_get_core(host));
}
+/** \ingroup m_host_management
+ * \brief Return the list of processes attached to an host.
+ *
+ * \param host a host
+ * \return a swag with the attached processes
+ */
+xbt_swag_t MSG_host_get_process_list(msg_host_t host)
+{
+ xbt_assert((host != NULL), "Invalid parameters");
+
+ return (simcall_host_get_process_list(host));
+}
+
+
/** \ingroup m_host_management
* \brief Returns the value of a given host property
*
@@ -305,9 +324,9 @@ int MSG_host_is_avail(msg_host_t host)
* \param host a host
* \param params a prameter object
*/
-void MSG_host_set_params(msg_host_t ind_pm, ws_params_t params)
+void MSG_host_set_params(msg_host_t host, ws_params_t params)
{
- simcall_host_set_params(ind_pm, params);
+ simcall_host_set_params(host, params);
}
/** \ingroup m_host_management
@@ -316,7 +335,111 @@ void MSG_host_set_params(msg_host_t ind_pm, ws_params_t params)
* \param host a host
* \param params a prameter object
*/
-void MSG_host_get_params(msg_host_t ind_pm, ws_params_t params)
+void MSG_host_get_params(msg_host_t host, ws_params_t params)
+{
+ simcall_host_get_params(host, params);
+}
+
+/** \ingroup m_host_management
+ * \brief Return the speed of the processor (in flop/s) at a given pstate
+ *
+ * \param host host to test
+ * \param pstate_index pstate to test
+ * \return Returns the processor speed associated with pstate_index
+ */
+double MSG_get_host_power_peak_at(msg_host_t host, int pstate_index) {
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+ return (simcall_host_get_power_peak_at(host, pstate_index));
+}
+
+/** \ingroup m_host_management
+ * \brief Return the current speed of the processor (in flop/s)
+ *
+ * \param host host to test
+ * \return Returns the current processor speed
+ */
+double MSG_get_host_current_power_peak(msg_host_t host) {
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+ return simcall_host_get_current_power_peak(host);
+}
+
+/** \ingroup m_host_management
+ * \brief Return the number of pstates defined for a host
+ *
+ * \param host host to test
+ */
+int MSG_get_host_nb_pstates(msg_host_t host) {
+
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+ return (simcall_host_get_nb_pstates(host));
+}
+
+/** \ingroup m_host_management
+ * \brief Sets the speed of the processor (in flop/s) at a given pstate
+ *
+ * \param host host to test
+ * \param pstate_index pstate to switch to
+ */
+void MSG_set_host_power_peak_at(msg_host_t host, int pstate_index) {
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+
+ simcall_host_set_power_peak_at(host, pstate_index);
+}
+
+/** \ingroup m_host_management
+ * \brief Return the total energy consumed by a host (in Joules)
+ *
+ * \param host host to test
+ * \return Returns the consumed energy
+ */
+double MSG_get_host_consumed_energy(msg_host_t host) {
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+ return simcall_host_get_consumed_energy(host);
+}
+
+/** \ingroup m_host_management
+ * \brief Return the list of mount point names on an 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_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)
{
- simcall_host_get_params(ind_pm, params);
+ xbt_assert((host != NULL), "Invalid parameters");
+ return (simcall_host_get_attached_storage_list(host));
+}
+
+/** \ingroup msg_host_management
+ * \brief Return the content of mounted storages on an host.
+ * \param host a host
+ * \return a dict containing content (as a dict) of all storages mounted on the host
+ */
+xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
+{
+ xbt_assert((host != NULL), "Invalid parameters");
+ xbt_dict_t contents = xbt_dict_new_homogeneous(NULL);
+ msg_storage_t storage;
+ char* storage_name;
+ char* mount_name;
+ xbt_dict_cursor_t cursor = NULL;
+
+ 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);
+ xbt_dict_t content = simcall_storage_get_content(storage);
+ xbt_dict_set(contents,mount_name, content,NULL);
+ }
+ xbt_dict_free(&storage_list);
+ return contents;
}