kill two more useless calls

[simgrid.git] / src / simgrid / host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 2f70c60..b3f5bd6 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -64,9 +64,9 @@ int SIMIX_HOST_LEVEL;
 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"
 
@@ -137,8 +137,8 @@ double sg_host_get_available_speed(sg_host_t 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));
+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).
@@ -154,7 +154,7 @@ double sg_host_get_consumed_energy(sg_host_t 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->p_cpu->getNbPStates();
 }
 
 /** @brief Gets the pstate at which that host currently runs.
@@ -162,7 +162,7 @@ int sg_host_get_nb_pstates(sg_host_t host) {
  *  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 {
@@ -177,19 +177,53 @@ Host::~Host()
 }
 
 /** 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()
+{
+  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));
+}
+
+/** Get the peak power of a host */
+double Host::getCurrentPowerPeak()
+{
+  return simgrid::simix::kernel(
+    std::bind(SIMIX_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));
+}
+
 /** @brief Get the speed of the cpu associated to a host */
 double Host::getSpeed() {
        return p_cpu->getSpeed(1.0);
@@ -214,4 +248,62 @@ Host* Host::by_name_or_create(const char* name)
   return host;
 }
 
+/** Set the pstate at which the host should run */
+void Host::setPstate(int 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(
+      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(
+      surf_host_get_wattmax_at, this, pstate
+  ));
+}
+
+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
+  ));
+}
+
 }