-/* Copyright (c) 2013-2015. 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
#include "xbt/dict.h"
#include "simgrid/host.h"
+#include <xbt/Extendable.hpp>
+#include <simgrid/s4u/host.hpp>
+
+#include "src/surf/HostImpl.hpp"
#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
-sg_host_t sg_host_by_name(const char *name){
- return xbt_lib_get_elm_or_null(host_lib, name);
-}
-
-sg_host_t sg_host_by_name_or_create(const char *name) {
- sg_host_t res = xbt_lib_get_elm_or_null(host_lib, name);
- if (!res) {
- xbt_lib_set(host_lib,name,0,NULL); // Should only create the bucklet with no data added
- res = xbt_lib_get_elm_or_null(host_lib, name);
- }
- return res;
-}
-xbt_dynar_t sg_hosts_as_dynar(void) {
- xbt_lib_cursor_t cursor;
- char *key;
- void **data;
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL);
-
- xbt_lib_foreach(host_lib, cursor, key, data) {
- if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST) {
- xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
- xbt_dynar_push(res, &elm);
- }
- }
- return res;
-}
-
-// ========= Layering madness ==============
-
-int MSG_HOST_LEVEL;
-int SD_HOST_LEVEL;
-int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
-int SURF_CPU_LEVEL;
-int USER_HOST_LEVEL;
-
-#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
-#include "src/simdag/private.h" // __SD_workstation_destroy. FIXME: killme
-#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_routing.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()
+ */
+sg_host_t *sg_host_list() {
+ 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)
+{
+ return host->name().c_str();
+}
+
+void* sg_host_extension_get(sg_host_t host, size_t ext)
+{
+ return host->extension(ext);
+}
-static XBT_INLINE void surf_cpu_free(void *r) {
- delete static_cast<Cpu*>(r);
+size_t sg_host_extension_create(void(*deleter)(void*))
+{
+ return simgrid::s4u::Host::extension_create(deleter);
}
-static XBT_INLINE void routing_asr_host_free(void *p) {
- delete static_cast<RoutingEdge*>(p);
+
+sg_host_t sg_host_by_name(const char *name)
+{
+ return simgrid::s4u::Host::by_name_or_null(name);
}
-void sg_host_init() {
- MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_priv_free);
- SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
+xbt_dynar_t sg_hosts_as_dynar()
+{
+ xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
- SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
- SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_cpu_free);
- ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
- USER_HOST_LEVEL = xbt_lib_add_level(host_lib,NULL);
+ xbt_dict_cursor_t cursor = nullptr;
+ const char* name = nullptr;
+ simgrid::s4u::Host* host = nullptr;
+ xbt_dict_foreach(host_list, cursor, name, host)
+ if (host && host->pimpl_netcard && host->pimpl_netcard->isHost())
+ xbt_dynar_push(res, &host);
+ return res;
}
+
+// ========= Layering madness ==============*
+
+#include "src/surf/cpu_interface.hpp"
+#include "src/surf/surf_routing.hpp"
+
// ========== User data Layer ==========
void *sg_host_user(sg_host_t host) {
- return xbt_lib_get_level(host, USER_HOST_LEVEL);
+ return host->extension(USER_HOST_LEVEL);
}
void sg_host_user_set(sg_host_t host, void* userdata) {
- xbt_lib_set(host_lib,host->key,USER_HOST_LEVEL,userdata);
+ host->extension_set(USER_HOST_LEVEL,userdata);
}
void sg_host_user_destroy(sg_host_t host) {
- xbt_lib_unset(host_lib,host->key,USER_HOST_LEVEL,1);
+ host->extension_set(USER_HOST_LEVEL, nullptr);
}
// ========== MSG Layer ==============
msg_host_priv_t sg_host_msg(sg_host_t host) {
- return (msg_host_priv_t) xbt_lib_get_level(host, MSG_HOST_LEVEL);
+ return (msg_host_priv_t) host->extension(MSG_HOST_LEVEL);
}
void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
- xbt_lib_set(host_lib,host->key,MSG_HOST_LEVEL,smx_host);
-}
-void sg_host_msg_destroy(sg_host_t host) {
- xbt_lib_unset(host_lib,host->key,MSG_HOST_LEVEL,1);
-}
-// ========== SimDag Layer ==============
-SD_workstation_priv_t sg_host_sd(sg_host_t host) {
- return (SD_workstation_priv_t) xbt_lib_get_level(host, SD_HOST_LEVEL);
-}
-void sg_host_sd_set(sg_host_t host, SD_workstation_priv_t smx_host) {
- xbt_lib_set(host_lib,host->key,SD_HOST_LEVEL,smx_host);
-}
-void sg_host_sd_destroy(sg_host_t host) {
- xbt_lib_unset(host_lib,host->key,SD_HOST_LEVEL,1);
+ host->extension_set(MSG_HOST_LEVEL, smx_host);
}
// ========== Simix layer =============
+#include "src/simix/smx_host_private.h"
smx_host_priv_t sg_host_simix(sg_host_t host){
- return (smx_host_priv_t) xbt_lib_get_level(host, SIMIX_HOST_LEVEL);
+ return host->extension<simgrid::simix::Host>();
}
void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
- xbt_assert(xbt_lib_get_or_null(host_lib,host->key,SIMIX_HOST_LEVEL) == NULL);
- xbt_lib_set(host_lib,host->key,SIMIX_HOST_LEVEL,smx_host);
-}
-void sg_host_simix_destroy(sg_host_t host) {
- xbt_lib_unset(host_lib,host->key,SIMIX_HOST_LEVEL,1);
+ host->extension_set<simgrid::simix::Host>(smx_host);
}
-// ========== SURF CPU ============
-surf_cpu_t sg_host_surfcpu(sg_host_t host) {
- return (surf_cpu_t) xbt_lib_get_level(host, SURF_CPU_LEVEL);
+// ========= storage related functions ============
+xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
+ return host->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
}
-void sg_host_surfcpu_set(sg_host_t host, surf_cpu_t cpu) {
- xbt_lib_set(host_lib, host->key, SURF_CPU_LEVEL, cpu);
-}
-void sg_host_surfcpu_register(sg_host_t host, surf_cpu_t cpu)
-{
- surf_callback_emit(cpuCreatedCallbacks, cpu);
- surf_callback_emit(cpuStateChangedCallbacks, cpu, SURF_RESOURCE_ON, cpu->getState());
- sg_host_surfcpu_set(host, cpu);
-}
-void sg_host_surfcpu_destroy(sg_host_t host) {
- xbt_lib_unset(host_lib,host->key,SURF_CPU_LEVEL,1);
-}
-// ========== RoutingEdge ============
-RoutingEdge *sg_host_edge(sg_host_t host) {
- return (RoutingEdge*) xbt_lib_get_level(host, ROUTING_HOST_LEVEL);
-}
-void sg_host_edge_set(sg_host_t host, RoutingEdge *edge) {
- xbt_lib_set(host_lib, host->key, ROUTING_HOST_LEVEL, edge);
-}
-void sg_host_edge_destroy(sg_host_t host, int do_callback) {
- xbt_lib_unset(host_lib,host->key,ROUTING_HOST_LEVEL,do_callback);
+
+xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
+ return host->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
}
// =========== user-level functions ===============
// ================================================
-double sg_host_get_speed(sg_host_t host){
- return surf_host_get_speed(host, 1.0);
-}
-
-double sg_host_get_available_speed(sg_host_t host){
- return surf_host_get_available_speed(host);
-}
-/** @brief Returns the number of core of the processor. */
-int sg_host_get_core(sg_host_t host) {
- return surf_host_get_core(host);
-}
-/** @brief Returns the state of a host.
- * @return 1 if the host is active or 0 if it has crashed.
- */
-int sg_host_get_state(sg_host_t host) {
- return surf_host_get_state(surf_host_resource_priv(host));
+/** @brief Returns the total speed of a host */
+double sg_host_speed(sg_host_t host)
+{
+ return host->speed();
}
-/** @brief Returns the total energy consumed by the host (in Joules).
- *
- * See also @ref SURF_plugin_energy.
- */
-double sg_host_get_consumed_energy(sg_host_t host) {
- return surf_host_get_consumed_energy(host);
+double sg_host_get_available_speed(sg_host_t host)
+{
+ return host->pimpl_cpu->getAvailableSpeed();
}
/** @brief Returns the number of power states for a host.
* See also @ref SURF_plugin_energy.
*/
int sg_host_get_nb_pstates(sg_host_t host) {
- return surf_host_get_nb_pstates(host);
+ return host->pstatesCount();
}
/** @brief Gets the pstate at which that host currently runs.
* See also @ref SURF_plugin_energy.
*/
int sg_host_get_pstate(sg_host_t host) {
- return surf_host_get_pstate(host);
+ return host->pstate();
+}
+/** @brief Sets the pstate at which that host should run.
+ *
+ * See also @ref SURF_plugin_energy.
+ */
+void sg_host_set_pstate(sg_host_t host,int pstate) {
+ host->setPstate(pstate);
+}
+
+/** @brief Get the properties of an host */
+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 nullptr 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 information about a host */
+void sg_host_dump(sg_host_t host)
+{
+ xbt_dict_t props;
+ xbt_dict_cursor_t cursor=nullptr;
+ char *key,*data;
+
+ XBT_INFO("Displaying host %s", sg_host_get_name(host));
+ XBT_INFO(" - speed: %.0f", host->speed());
+ 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);
+ }
+ }
}
