Energy: Fixed host parsing assertion + mem leak

[simgrid.git] / src / surf / plugins / energy.cpp

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index d0d1d32..9a6cc76 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -205,8 +205,8 @@ void HostEnergy::initWattsRangeList()
   for (int i=0; i< pstate_nb; i++) {
     /* retrieve the power values associated with the current pstate */
     xbt_dynar_t current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":");
   for (int i=0; i< pstate_nb; i++) {
     /* retrieve the power values associated with the current pstate */
     xbt_dynar_t current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":");

-    xbt_assert(xbt_dynar_length(current_power_values) > 1,
-        "Power properties incorrectly defined - could not retrieve min and max power values for host %s",
+    xbt_assert(xbt_dynar_length(current_power_values) == 3,
+        "Power properties incorrectly defined - could not retrieve idle, min and max power values for host %s",

         host->name().c_str());
 
     /* min_power corresponds to the idle power (cpu load = 0) */
         host->name().c_str());
 
     /* min_power corresponds to the idle power (cpu load = 0) */


@@ -220,6 +220,7 @@ void HostEnergy::initWattsRangeList()
       xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 2, char*), msg_max)
     );
     power_range_watts_list.push_back(range);
       xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 2, char*), msg_max)
     );
     power_range_watts_list.push_back(range);

+    xbt_free(msg_idle);

     xbt_free(msg_min);
     xbt_free(msg_max);
 
     xbt_free(msg_min);
     xbt_free(msg_max);
 


@@ -233,7 +234,7 @@ void HostEnergy::initWattsRangeList()
 
 /* **************************** events  callback *************************** */
 static void onCreation(simgrid::s4u::Host& host) {
 
 /* **************************** events  callback *************************** */
 static void onCreation(simgrid::s4u::Host& host) {

-  if (dynamic_cast<simgrid::surf::VirtualMachineImpl*>(host.pimpl_)) // Ignore virtual machines
+  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines

     return;
   host.extension_set(new HostEnergy(&host));
 }
     return;
   host.extension_set(new HostEnergy(&host));
 }


@@ -245,9 +246,9 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf:
     if(sghost == nullptr)
       continue;
     simgrid::surf::HostImpl* host     = sghost->pimpl_;
     if(sghost == nullptr)
       continue;
     simgrid::surf::HostImpl* host     = sghost->pimpl_;

-    simgrid::surf::VirtualMachineImpl* vm = dynamic_cast<simgrid::surf::VirtualMachineImpl*>(host);
+    simgrid::s4u::VirtualMachine* vm  = dynamic_cast<simgrid::s4u::VirtualMachine*>(sghost);

     if (vm) // If it's a VM, take the corresponding PM
     if (vm) // If it's a VM, take the corresponding PM

-      host = vm->getPm()->pimpl_;
+      host = vm->pimpl_vm_->getPm()->pimpl_;

 
     HostEnergy *host_energy = host->piface_->extension<HostEnergy>();
 
 
     HostEnergy *host_energy = host->piface_->extension<HostEnergy>();
 


@@ -257,7 +258,7 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf:
 }
 
 static void onHostStateChange(simgrid::s4u::Host &host) {
 }
 
 static void onHostStateChange(simgrid::s4u::Host &host) {

-  if (dynamic_cast<simgrid::surf::VirtualMachineImpl*>(host.pimpl_)) // Ignore virtual machines
+  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines

     return;
 
   HostEnergy *host_energy = host.extension<HostEnergy>();
     return;
 
   HostEnergy *host_energy = host.extension<HostEnergy>();


@@ -268,7 +269,7 @@ static void onHostStateChange(simgrid::s4u::Host &host) {
 
 static void onHostDestruction(simgrid::s4u::Host& host) {
   // Ignore virtual machines
 
 static void onHostDestruction(simgrid::s4u::Host& host) {
   // Ignore virtual machines

-  if (dynamic_cast<simgrid::surf::VirtualMachineImpl*>(host.pimpl_))
+  if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host))

     return;
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();
     return;
   HostEnergy *host_energy = host.extension<HostEnergy>();
   host_energy->update();