Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Move the signals from simgrid::surf::Host to simgrid::Host
[simgrid.git] / src / surf / plugins / energy.cpp
index 75b43a2..058ae23 100644 (file)
@@ -114,12 +114,6 @@ HostEnergy::HostEnergy(simgrid::Host *ptr) :
 
 HostEnergy::~HostEnergy()
 {
-  // Ignore virtual machines
-  if (dynamic_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host>()))
-    return;
-  this->update();
-  XBT_INFO("Total energy of host %s: %f Joules",
-    host->getName().c_str(), this->getConsumedEnergy());
 }
 
 double HostEnergy::getWattMinAt(int pstate)
@@ -158,8 +152,9 @@ double HostEnergy::getCurrentWattsValue(double cpu_load)
 
 double HostEnergy::getConsumedEnergy()
 {
-       if(last_updated < surf_get_clock())
-               this->update();
+       if (last_updated < surf_get_clock()) // We need to simcall this as it modifies the environment
+         simgrid::simix::kernel(std::bind(&HostEnergy::update, this));
+
        return total_energy;
 }
 
@@ -194,34 +189,54 @@ void HostEnergy::initWattsRangeList()
        xbt_dynar_free(&all_power_values);
 }
 
-double surf_host_get_wattmin_at(sg_host_t host, int pstate)
-{
-  xbt_assert(HostEnergy::EXTENSION_ID.valid(),
-    "The Energy plugin is not active. "
-    "Please call sg_energy_plugin_init() during initialization.");
-  return host->extension<HostEnergy>()->getWattMinAt(pstate);
 }
-double surf_host_get_wattmax_at(sg_host_t host, int pstate)
-{
-  xbt_assert(HostEnergy::EXTENSION_ID.valid(),
-    "The Energy plugin is not active. "
-    "Please call sg_energy_plugin_init() during initialization.");
-  return host->extension<HostEnergy>()->getWattMaxAt(pstate);
 }
 
-double surf_host_get_consumed_energy(sg_host_t host)
-{
-  xbt_assert(HostEnergy::EXTENSION_ID.valid(),
-    "The Energy plugin is not active. "
-    "Please call sg_energy_plugin_init() during initialization.");
-  return host->extension<HostEnergy>()->getConsumedEnergy();
+/* **************************** events  callback *************************** */
+static void onCreation(simgrid::Host& host) {
+  simgrid::surf::Host* surf_host = host.extension<simgrid::surf::Host>();
+  if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host)) // Ignore virtual machines
+    return;
+  host.extension_set(new HostEnergy(&host));
 }
 
+static void onActionStateChange(simgrid::surf::CpuAction *action,
+    e_surf_action_state_t old, e_surf_action_state_t cur) {
+  const char *name = getActionCpu(action)->getName();
+  simgrid::surf::Host *host = sg_host_by_name(name)->extension<simgrid::surf::Host>();
+  simgrid::surf::VirtualMachine *vm = dynamic_cast<simgrid::surf::VirtualMachine*>(host);
+  if (vm) // If it's a VM, take the corresponding PM
+    host = vm->getPm()->extension<simgrid::surf::Host>();
+
+  HostEnergy *host_energy = host->p_host->extension<HostEnergy>();
+
+  if(host_energy->last_updated < surf_get_clock())
+    host_energy->update();
 }
+
+static void onHostStateChange(simgrid::Host &host) {
+  simgrid::surf::Host* surf_host = host.extension<simgrid::surf::Host>();
+  if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host)) // Ignore virtual machines
+    return;
+
+  HostEnergy *host_energy = host.extension<HostEnergy>();
+
+  if(host_energy->last_updated < surf_get_clock())
+    host_energy->update();
 }
 
-/* **************************** Public interface *************************** */
+static void onHostDestruction(simgrid::Host& host) {
+  // Ignore virtual machines
+  simgrid::surf::Host* surf_host = host.extension<simgrid::surf::Host>();
+  if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host))
+    return;
+  HostEnergy *host_energy = host.extension<HostEnergy>();
+  host_energy->update();
+  XBT_INFO("Total energy of host %s: %f Joules",
+    host.getName().c_str(), host_energy->getConsumedEnergy());
+}
 
+/* **************************** Public interface *************************** */
 /** \ingroup SURF_plugin_energy
  * \brief Enable energy plugin
  * \details Enable energy plugin to get joules consumption of each cpu. You should call this function before #MSG_init().
@@ -233,39 +248,10 @@ void sg_energy_plugin_init(void)
 
   HostEnergy::EXTENSION_ID = simgrid::Host::extension_create<HostEnergy>();
 
-  /* The following attaches an anonymous function to the Host::onCreation signal */
-  /* Search for "C++ lambda" for more information on the syntax used here */
-  simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host *host) {
-    if (dynamic_cast<simgrid::surf::VirtualMachine*>(host)) // Ignore virtual machines
-      return;
-    host->p_host->extension_set(new HostEnergy(host->p_host));
-  });
-
-  simgrid::surf::CpuAction::onStateChange.connect([](simgrid::surf::CpuAction *action,
-      e_surf_action_state_t old,
-      e_surf_action_state_t cur) {
-    const char *name = getActionCpu(action)->getName();
-    simgrid::surf::Host *host = sg_host_by_name(name)->extension<simgrid::surf::Host>();
-    simgrid::surf::VirtualMachine *vm = dynamic_cast<simgrid::surf::VirtualMachine*>(host);
-    if (vm) // If it's a VM, take the corresponding PM
-        host = vm->getPm()->extension<simgrid::surf::Host>();
-
-    HostEnergy *host_energy = host->p_host->extension<HostEnergy>();
-
-    if(host_energy->last_updated < surf_get_clock())
-      host_energy->update();
-
-  });
-
-  simgrid::surf::Host::onStateChange.connect([] (simgrid::surf::Host *host) {
-    if (dynamic_cast<simgrid::surf::VirtualMachine*>(host)) // Ignore virtual machines
-      return;
-
-    HostEnergy *host_energy = host->p_host->extension<HostEnergy>();
-
-    if(host_energy->last_updated < surf_get_clock())
-      host_energy->update();
-  });
+  simgrid::Host::onCreation.connect(&onCreation);
+  simgrid::Host::onStateChange.connect(&onHostStateChange);
+  simgrid::Host::onDestruction.connect(&onHostDestruction);
+  simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange);
 }
 
 /** @brief Returns the total energy consumed by the host so far (in Joules)
@@ -273,18 +259,23 @@ void sg_energy_plugin_init(void)
  *  See also @ref SURF_plugin_energy.
  */
 double sg_host_get_consumed_energy(sg_host_t host) {
-  return simgrid::energy::surf_host_get_consumed_energy(host);
+  xbt_assert(HostEnergy::EXTENSION_ID.valid(),
+    "The Energy plugin is not active. "
+    "Please call sg_energy_plugin_init() during initialization.");
+  return host->extension<HostEnergy>()->getConsumedEnergy();
 }
 
 /** @brief Get the amount of watt dissipated at the given pstate when the host is idling */
 double sg_host_get_wattmin_at(sg_host_t host, int pstate) {
-  return simgrid::simix::kernel(std::bind(
-      simgrid::energy::surf_host_get_wattmin_at, host, pstate
-  ));
+  xbt_assert(HostEnergy::EXTENSION_ID.valid(),
+    "The Energy plugin is not active. "
+    "Please call sg_energy_plugin_init() during initialization.");
+  return host->extension<HostEnergy>()->getWattMinAt(pstate);
 }
 /** @brief  Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100% */
 double sg_host_get_wattmax_at(sg_host_t host, int pstate) {
-  return simgrid::simix::kernel(std::bind(
-      simgrid::energy::surf_host_get_wattmax_at, host, pstate
-  ));
+  xbt_assert(HostEnergy::EXTENSION_ID.valid(),
+    "The Energy plugin is not active. "
+    "Please call sg_energy_plugin_init() during initialization.");
+  return host->extension<HostEnergy>()->getWattMaxAt(pstate);
 }