From 7e50ced3b9f4b2d4a13f01e257dcac32b673b43e Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Sat, 8 Feb 2014 23:35:31 +0100
Subject: [PATCH] Free surf_energy on exit.

---
 src/surf/plugins/energy.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index 9784cbb8f1..40a87b573e 100644
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -54,6 +54,12 @@ static void energyCpuActionStateChangedCallback(CpuActionPtr action){
   }
 }
 
+static void sg_energy_plugin_exit()
+{
+  delete surf_energy;
+  surf_energy = NULL;
+}
+
 /** \ingroup SURF_plugin_energy
  * \brief Enable energy plugin
  * \details Enable energy plugin to get joules consumption of each cpu.
@@ -64,7 +70,7 @@ void sg_energy_plugin_init() {
     surf_callback_connect(cpuCreatedCallbacks, energyCpuCreatedCallback);
     surf_callback_connect(cpuDestructedCallbacks, energyCpuDestructedCallback);
     surf_callback_connect(cpuActionStateChangedCallbacks, energyCpuActionStateChangedCallback);
-
+    surf_callback_connect(surfExitCallbacks, sg_energy_plugin_exit);
   }
 }
 
-- 
2.20.1