Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
kill unused sg_host_msg_destroy()
[simgrid.git] / src / simgrid / host.cpp
index 233d081..236376b 100644 (file)
@@ -1,14 +1,19 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-201. 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 "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()
 {
   return xbt_dict_length(host_list);
@@ -60,9 +65,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/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"
 
@@ -73,7 +78,7 @@ void sg_host_init()
   });
 
   ROUTING_HOST_LEVEL = simgrid::Host::extension_create([](void *p) {
-         delete static_cast<simgrid::surf::RoutingEdge*>(p);
+         delete static_cast<simgrid::surf::NetCard*>(p);
   });
 
   SD_HOST_LEVEL = simgrid::Host::extension_create(__SD_workstation_destroy);
@@ -99,9 +104,6 @@ msg_host_priv_t sg_host_msg(sg_host_t host) {
 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);
@@ -124,43 +126,17 @@ void sg_host_simix_destroy(sg_host_t host) {
   host->extension_set(SIMIX_HOST_LEVEL, nullptr);
 }
 
-// ========== RoutingEdge ============
-surf_RoutingEdge *sg_host_edge(sg_host_t host) {
-       return (surf_RoutingEdge*) host->extension(ROUTING_HOST_LEVEL);
-}
-void sg_host_edge_set(sg_host_t host, surf_RoutingEdge *edge) {
-  host->extension_set(ROUTING_HOST_LEVEL, edge);
-}
-void sg_host_edge_destroy(sg_host_t host, int do_callback) {
-  host->extension_set(ROUTING_HOST_LEVEL, nullptr, do_callback);
-}
-
 // =========== 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 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.
@@ -168,7 +144,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->pimpl_cpu->getNbPStates();
 }
 
 /** @brief Gets the pstate at which that host currently runs.
@@ -176,7 +152,14 @@ 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->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);
 }
 
 namespace simgrid {
@@ -190,6 +173,63 @@ Host::~Host()
 {
 }
 
+/** Start the host if it is off */
+void Host::turnOn()
+{
+  simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
+}
+
+/** Stop the host if it is on */
+void Host::turnOff()
+{
+  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(sg_host_get_properties, this));
+}
+
+/** Get the processes attached to the host */
+xbt_swag_t Host::getProcessList()
+{
+  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(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(surf_host_get_power_peak_at, this, pstate_index));
+}
+
+/** @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();
+}
+
 Host* Host::by_name_or_null(const char* name)
 {
   return (Host*) xbt_dict_get_or_null(host_list, name);
@@ -205,4 +245,55 @@ Host* Host::by_name_or_create(const char* name)
   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([&]() {
+    this->extension<simgrid::surf::Host>()->getParams(params);
+  });
+}
+
+void Host::setParams(vm_params_t params)
+{
+  simgrid::simix::kernel([&]() {
+    this->extension<simgrid::surf::Host>()->setParams(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([&] {
+    return this->extension<simgrid::surf::Host>()->getMountedStorageList();
+  });
+}
+
+/**
+ * \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([&] {
+    return this->extension<simgrid::surf::Host>()->getAttachedStorageList();
+  });
+}
+
 }