-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <simgrid/simix.hpp>
-
#include "xbt/dict.h"
#include "simgrid/host.h"
-#include "simgrid/Host.hpp"
+#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
-#include "src/simix/smx_private.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->getName().c_str();
+ return host->name().c_str();
}
void* sg_host_extension_get(sg_host_t host, size_t ext)
size_t sg_host_extension_create(void(*deleter)(void*))
{
- return simgrid::Host::extension_create(deleter);
+ return simgrid::s4u::Host::extension_create(deleter);
}
sg_host_t sg_host_by_name(const char *name)
{
- return simgrid::Host::by_name_or_null(name);
+ return simgrid::s4u::Host::by_name_or_null(name);
}
-sg_host_t sg_host_by_name_or_create(const char *name)
+xbt_dynar_t sg_hosts_as_dynar()
{
- return simgrid::Host::by_name_or_create(name);
-}
-
-xbt_dynar_t sg_hosts_as_dynar(void)
-{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
xbt_dict_cursor_t cursor = nullptr;
const char* name = nullptr;
- simgrid::Host* host = nullptr;
- xbt_dict_foreach(host_list, cursor, name, host)
- if(routing_get_network_element_type(name) == SURF_NETWORK_ELEMENT_HOST)
- xbt_dynar_push(res, &host);
- return res;
+ 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 ==============
-
-int MSG_HOST_LEVEL;
-int SD_HOST_LEVEL;
-int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
-int USER_HOST_LEVEL;
+// ========= Layering madness ==============*
-#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme by initializing that level in msg when used
-#include "src/simdag/simdag_private.h" // __SD_workstation_destroy. FIXME: killme by initializing that level in simdag when used
-#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme by initializing that level in simix when used
#include "src/surf/cpu_interface.hpp"
#include "src/surf/surf_routing.hpp"
-void sg_host_init()
-{
- MSG_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
- __MSG_host_priv_free((msg_host_priv_t) p);
- });
-
- ROUTING_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
- delete static_cast<simgrid::surf::NetCard*>(p);
- });
-
- SD_HOST_LEVEL = simgrid::Host::extension_create(__SD_workstation_destroy);
- SIMIX_HOST_LEVEL = simgrid::Host::extension_create(SIMIX_host_destroy);
- USER_HOST_LEVEL = simgrid::Host::extension_create(NULL);
-}
-
// ========== User data Layer ==========
void *sg_host_user(sg_host_t host) {
return host->extension(USER_HOST_LEVEL);
// ========== MSG Layer ==============
msg_host_priv_t sg_host_msg(sg_host_t host) {
- return (msg_host_priv_t) host->extension(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) {
host->extension_set(MSG_HOST_LEVEL, smx_host);
}
-void sg_host_msg_destroy(sg_host_t host) {
- host->extension_set(MSG_HOST_LEVEL, nullptr);
-}
-// ========== 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 =============
+#include "src/simix/smx_host_private.h"
smx_host_priv_t sg_host_simix(sg_host_t host){
- return (smx_host_priv_t) host->extension(SIMIX_HOST_LEVEL);
+ return host->extension<simgrid::simix::Host>();
}
void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
- host->extension_set(SIMIX_HOST_LEVEL, smx_host);
+ host->extension_set<simgrid::simix::Host>(smx_host);
}
void sg_host_simix_destroy(sg_host_t host) {
- host->extension_set(SIMIX_HOST_LEVEL, nullptr);
+ host->extension_set<simgrid::simix::Host>(nullptr);
}
+// ========= storage related functions ============
+xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
+ return host->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
+}
+
+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_available_speed(sg_host_t host){
- return surf_host_get_available_speed(host);
+/** @brief Returns the total speed of a host */
+double sg_host_speed(sg_host_t host)
+{
+ return host->speed();
}
-/** @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->pimpl_cpu->isOn();
+
+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 host->pimpl_cpu->getNbPStates();
+ 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 host->getPState();
+ 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);
-}
-
-namespace simgrid {
-
-Host::Host(std::string const& id)
- : name_(id)
-{
-}
-
-Host::~Host()
-{
-}
-
-/** Start the host if it is off */
-void Host::turnOn()
-{
- simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
+ host->setPstate(pstate);
}
-/** Stop the host if it is on */
-void Host::turnOff()
-{
- /* Go to that function to follow the code flow through the simcall barrier */
- if (0) simcall_HANDLER_host_off(&SIMIX_process_self()->simcall, this);
- simgrid::simix::simcall<void>(SIMCALL_HOST_OFF, this);
-}
-
-bool Host::isOn() {
- return pimpl_cpu->isOn();
-}
-bool Host::isOff() {
- return ! pimpl_cpu->isOn();
-}
-
-
-/** Get the properties assigned to a host */
-xbt_dict_t Host::getProperties()
-{
- return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, this));
-}
-
-/** Get the processes attached to the host */
-xbt_swag_t Host::getProcessList()
-{
- return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, this));
+/** @brief Get the properties of an host */
+xbt_dict_t sg_host_get_properties(sg_host_t host) {
+ return host->properties();
}
-/** Get the peak power of a host */
-double Host::getCurrentPowerPeak()
+/** \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 simgrid::simix::kernel(
- std::bind(SIMIX_host_get_current_power_peak, this));
+ return (const char*) xbt_dict_get_or_null(sg_host_get_properties(host), name);
}
-/** Get one power peak (in flops/s) of a host at a given pstate */
-double Host::getPowerPeakAt(int pstate_index)
+/** @brief Displays debugging information about a host */
+void sg_host_dump(sg_host_t host)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_power_peak_at, this, pstate_index));
-}
+ xbt_dict_t props;
+ xbt_dict_cursor_t cursor=nullptr;
+ char *key,*data;
-/** @brief Get the speed of the cpu associated to a host */
-double Host::getSpeed() {
- return pimpl_cpu->getSpeed(1.0);
-}
-/** @brief Returns the number of core of the processor. */
-int Host::getCoreAmount() {
- return pimpl_cpu->getCore();
-}
+ 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);
-Host* Host::by_name_or_null(const char* name)
-{
- return (Host*) xbt_dict_get_or_null(host_list, name);
-}
+ if (!xbt_dict_is_empty(props)){
+ XBT_INFO(" - properties:");
-Host* Host::by_name_or_create(const char* name)
-{
- Host* host = by_name_or_null(name);
- if (host == nullptr) {
- host = new Host(name);
- xbt_dict_set(host_list, name, host, NULL);
+ xbt_dict_foreach(props,cursor,key,data) {
+ XBT_INFO(" %s->%s",key,data);
+ }
}
- return host;
-}
-
-/** @brief Set the pstate at which the host should run */
-void Host::setPState(int pstate_index)
-{
- simgrid::simix::kernel(std::bind(
- &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
- ));
-}
-/** @brief Retrieve the pstate at which the host is currently running */
-int Host::getPState()
-{
- return pimpl_cpu->getPState();
-}
-
-void Host::getParams(vm_params_t params)
-{
- simgrid::simix::kernel(std::bind(SIMIX_host_get_params, this, params));
-}
-
-void Host::setParams(vm_params_t params)
-{
- simgrid::simix::kernel(std::bind(SIMIX_host_set_params, this, params));
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages mounted on an host.
- * \return a dict containing all storages mounted on the host
- */
-xbt_dict_t Host::getMountedStorageList()
-{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_mounted_storage_list, this
- ));
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages attached to an host.
- * \return a dict containing all storages attached to the host
- */
-xbt_dynar_t Host::getAttachedStorageList()
-{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_attached_storage_list, this
- ));
-}
-
}
