X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be6965a2b4eeef9c8225b33abd4acb08f2b561ef..01dd1d293c39ba31c3e509cf413c11fc991a0043:/src/simgrid/host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 8e527800f2..94def06371 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-201. The SimGrid Team.
+/* Copyright (c) 2013-2016. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,10 +13,26 @@
 #include "src/simix/smx_private.hpp"
 #include "src/surf/host_interface.hpp"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
+
 size_t sg_host_count()
 {
   return xbt_dict_length(host_list);
 }
+/** @brief Returns the host list
+ *
+ * Uses sg_host_count() to know the array size.
+ *
+ * \return an array of \ref sg_host_t containing all the hosts in the platform.
+ * \remark The host order in this array is generally different from the
+ * creation/declaration order in the XML platform (we use a hash table
+ * internally).
+ * \see sg_host_count()
+ */
+const sg_host_t *sg_host_list(void) {
+  xbt_assert(sg_host_count() > 0, "There is no host!");
+  return (sg_host_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
+}
 
 const char *sg_host_get_name(sg_host_t host)
 {
@@ -96,16 +112,6 @@ msg_host_priv_t sg_host_msg(sg_host_t host) {
 void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
   host->extension_set(MSG_HOST_LEVEL, smx_host);
 }
-// ========== SimDag Layer ==============
-SD_workstation_priv_t sg_host_sd(sg_host_t host) {
-  return (SD_workstation_priv_t) host->extension(SD_HOST_LEVEL);
-}
-void sg_host_sd_set(sg_host_t host, SD_workstation_priv_t smx_host) {
-  host->extension_set(SD_HOST_LEVEL, smx_host);
-}
-void sg_host_sd_destroy(sg_host_t host) {
-  host->extension_set(SD_HOST_LEVEL, nullptr);
-}
 
 // ========== Simix layer =============
 smx_host_priv_t sg_host_simix(sg_host_t host){
@@ -118,17 +124,40 @@ void sg_host_simix_destroy(sg_host_t host) {
   host->extension_set(SIMIX_HOST_LEVEL, nullptr);
 }
 
+// ========= storage related functions ============
+xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
+  return host->extension<simgrid::surf::Host>()->getMountedStorageList();
+}
+
+xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
+  return host->extension<simgrid::surf::Host>()->getAttachedStorageList();
+}
+
+
 // =========== user-level functions ===============
 // ================================================
 
+/** @brief Returns the total speed of a host
+ */
+double sg_host_speed(sg_host_t host)
+{
+  return host->speed();
+}
+
 double sg_host_get_available_speed(sg_host_t host){
   return surf_host_get_available_speed(host);
 }
+/** @brief Returns the number of cores of a host
+*/
+int sg_host_core_count(sg_host_t host) {
+  return host->core_count();
+}
+
 /** @brief Returns the state of a host.
  *  @return 1 if the host is active or 0 if it has crashed.
  */
 int sg_host_is_on(sg_host_t host) {
-	return host->is_on();
+  return host->is_on();
 }
 
 /** @brief Returns the number of power states for a host.
@@ -159,3 +188,35 @@ xbt_dict_t sg_host_get_properties(sg_host_t host) {
   return host->properties();
 }
 
+/** \ingroup m_host_management
+ * \brief Returns the value of a given host property
+ *
+ * \param host a host
+ * \param name a property name
+ * \return value of a property (or NULL if property not set)
+*/
+const char *sg_host_get_property_value(sg_host_t host, const char *name)
+{
+  return (const char*) xbt_dict_get_or_null(sg_host_get_properties(host), name);
+}
+
+/** @brief Displays debugging informations about a host */
+void sg_host_dump(sg_host_t host)
+{
+  xbt_dict_t props;
+  xbt_dict_cursor_t cursor=NULL;
+  char *key,*data;
+
+  XBT_INFO("Displaying host %s", sg_host_get_name(host));
+  XBT_INFO("  - speed: %.0f", sg_host_speed(host));
+  XBT_INFO("  - available speed: %.2f", sg_host_get_available_speed(host));
+  props = sg_host_get_properties(host);
+
+  if (!xbt_dict_is_empty(props)){
+    XBT_INFO("  - properties:");
+
+    xbt_dict_foreach(props,cursor,key,data) {
+      XBT_INFO("    %s->%s",key,data);
+    }
+  }
+}