#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
#include "src/simix/smx_private.hpp"
+#include "src/surf/host_interface.hpp"
size_t sg_host_count()
{
int ROUTING_HOST_LEVEL;
int USER_HOST_LEVEL;
-#include "src/msg/msg_private.h" // MSG_host_priv_free. FIXME: killme
-#include "src/simdag/simdag_private.h" // __SD_workstation_destroy. FIXME: killme
-#include "src/simix/smx_host_private.h" // SIMIX_host_destroy. FIXME: killme
+#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_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);
/** @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 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);
+int sg_host_is_on(sg_host_t host) {
+ return host->pimpl_cpu->isOn();
}
/** @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->pimpl_cpu->getNbPStates();
}
/** @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->getPState();
+}
+/** @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->getProperties();
}
+
namespace simgrid {
Host::Host(std::string const& id)
}
/** Start the host if it is off */
-void Host::on()
+void Host::turnOn()
{
simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
}
/** Stop the host if it is on */
-void Host::off()
+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));
+ return simgrid::simix::kernel(std::bind(&simgrid::surf::Host::getProperties, this->extension(simgrid::surf::Host::EXTENSION_ID)));
}
/** Get the processes attached to the host */
xbt_swag_t Host::getProcessList()
{
- return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, this));
+ return simgrid::simix::kernel([&]() {
+ return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+ });
}
/** Get the peak power of a host */
double Host::getCurrentPowerPeak()
{
return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_current_power_peak, this));
+ std::bind(surf_host_get_current_power_peak, this));
}
/** Get one power peak (in flops/s) of a host at a given pstate */
double Host::getPowerPeakAt(int pstate_index)
{
return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_power_peak_at, this, pstate_index));
+ std::bind(surf_host_get_power_peak_at, this, pstate_index));
}
/** @brief Get the speed of the cpu associated to a host */
double Host::getSpeed() {
- return p_cpu->getSpeed(1.0);
+ return pimpl_cpu->getSpeed(1.0);
}
/** @brief Returns the number of core of the processor. */
int Host::getCoreAmount() {
- return p_cpu->getCore();
+ return pimpl_cpu->getCore();
}
Host* Host::by_name_or_null(const char* name)
return host;
}
-/** Set the pstate at which the host should run */
-void Host::setPstate(int pstate_index)
+/** @brief Set the pstate at which the host should run */
+void Host::setPState(int pstate_index)
{
- simgrid::simix::kernel(
- std::bind(SIMIX_host_set_pstate, this, pstate_index));
+ simgrid::simix::kernel(std::bind(
+ &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
+ ));
}
-
-/** Get the amount of watt dissipated at the given pstate when the host is idling */
-double Host::getWattMinAt(int pstate)
+/** @brief Retrieve the pstate at which the host is currently running */
+int Host::getPState()
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_wattmin_at, this, pstate));
-}
-
-/** Get the amount of watt dissipated at the given pstate when the host burns CPU at 100% */
-double Host::getWattMaxAt(int pstate)
-{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_wattmax_at, this, pstate));
+ return pimpl_cpu->getPState();
}
void Host::getParams(vm_params_t params)
{
- simgrid::simix::kernel(std::bind(SIMIX_host_get_params, this, params));
+ simgrid::simix::kernel([&]() {
+ this->extension<simgrid::surf::Host>()->getParams(params);
+ });
}
void Host::setParams(vm_params_t params)
{
- simgrid::simix::kernel(std::bind(SIMIX_host_set_params, this, params));
+ simgrid::simix::kernel([&]() {
+ this->extension<simgrid::surf::Host>()->setParams(params);
+ });
}
/**
*/
xbt_dict_t Host::getMountedStorageList()
{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_mounted_storage_list, this
- ));
+ return simgrid::simix::kernel([&] {
+ return this->extension<simgrid::surf::Host>()->getMountedStorageList();
+ });
}
/**
*/
xbt_dynar_t Host::getAttachedStorageList()
{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_attached_storage_list, this
- ));
+ return simgrid::simix::kernel([&] {
+ return this->extension<simgrid::surf::Host>()->getAttachedStorageList();
+ });
}
}
