make the host callbacks static to surf::Host instead of globals

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

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index b8b19cd..cbfde2c 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -142,13 +142,13 @@ void sg_energy_plugin_init() {
   if (simgrid::energy::surf_energy == NULL) {
     simgrid::energy::surf_energy =
       new std::map<simgrid::surf::Host*, simgrid::energy::HostEnergy*>();
-    simgrid::surf::hostCreatedCallbacks.connect(energyHostCreatedCallback);
     simgrid::surf::VMCreatedCallbacks.connect(energyVMCreatedCallback);
-    simgrid::surf::hostDestructedCallbacks.connect(energyHostDestructedCallback);
+    simgrid::surf::Host::creationCallbacks.connect(energyHostCreatedCallback);
+    simgrid::surf::Host::destructionCallbacks.connect(energyHostDestructedCallback);
     simgrid::surf::cpuActionStateChangedCallbacks.connect(
       energyCpuActionStateChangedCallback);
     simgrid::surf::surfExitCallbacks.connect(sg_energy_plugin_exit);
-    simgrid::surf::hostStateChangedCallbacks.connect(
+    simgrid::surf::Host::stateChangeCallbacks.connect(
       energyStateChangedCallback);
   }
 }