-/** \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().
- */
-void sg_energy_plugin_init() {
- if (surf_energy == NULL) {
- surf_energy = new std::map<Cpu*, CpuEnergy*>();
- surf_callback_connect(cpuCreatedCallbacks, energyCpuCreatedCallback);
- surf_callback_connect(cpuDestructedCallbacks, energyCpuDestructedCallback);
- surf_callback_connect(cpuActionStateChangedCallbacks, energyCpuActionStateChangedCallback);
- surf_callback_connect(surfExitCallbacks, sg_energy_plugin_exit);
- surf_callback_connect(cpuStateChangedCallbacks, energyStateChangedCallback);
+ if(host_energy->last_updated < surf_get_clock())
+ update_consumption(host, host_energy);
+
+ });
+
+ simgrid::surf::Host::onStateChange.connect([] (simgrid::surf::Host *host) {
+ if (dynamic_cast<simgrid::surf::VirtualMachine*>(host)) // Ignore virtual machines
+ return;
+
+ HostEnergy *host_energy = (*simgrid::energy::surf_energy)[host];
+
+ if(host_energy->last_updated < surf_get_clock())
+ update_consumption(host, host_energy);
+ });
+
+ simgrid::surf::surfExitCallbacks.connect([]() {
+ delete simgrid::energy::surf_energy;
+ simgrid::energy::surf_energy = NULL;
+ });