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"
/** @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));
+int sg_host_is_on(sg_host_t host) {
+ return host->p_cpu->isOn();
}
/** @brief Returns the total energy consumed by the host (in Joules).
* 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->p_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->p_cpu->getPState();
}
namespace simgrid {
}
/** 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 p_cpu->isOn();
+}
+bool Host::isOff() {
+ return ! p_cpu->isOn();
+}
+
+
/** Get the properties assigned to a host */
xbt_dict_t Host::getProperties()
{
/** 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, p_cpu, pstate_index
+ ));
}
/** Get the amount of watt dissipated at the given pstate when the host is idling */
double Host::getWattMinAt(int pstate)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_wattmin_at, this, pstate));
+ return simgrid::simix::kernel(std::bind(
+ surf_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 simgrid::simix::kernel(std::bind(
+ surf_host_get_wattmax_at, this, pstate
+ ));
}
void Host::getParams(vm_params_t params)