From 5c308e885ea1d130b4ea07782303a067658e6996 Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 4 Aug 2016 14:20:11 +0200
Subject: [PATCH] clean include + free->xbt_free

---
 src/simdag/sd_global.cpp    | 7 -------
 src/simdag/sd_task.cpp      | 4 +---
 src/simdag/simdag_private.h | 3 +++
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index f6fb1dcd66..2f55278dbe 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -4,17 +4,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "instr/instr_interface.h"
 #include "simgrid/sg_config.h"
 #include "simgrid/host.h"
 #include "src/simdag/simdag_private.h"
 #include "src/surf/surf_interface.hpp"
 #include "simgrid/s4u/engine.hpp"
 
-#if HAVE_JEDULE
-#include "simgrid/jedule/jedule_sd_binding.h"
-#endif
-
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)");
 
@@ -227,8 +222,6 @@ double SD_get_clock() {
  */
 void SD_exit()
 {
-  TRACE_surf_resource_utilization_release();
-
 #if HAVE_JEDULE
   jedule_sd_cleanup();
   jedule_sd_exit();
diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 1631fa6a8e..c6f3a65ed2 100644
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -7,8 +7,6 @@
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "src/simdag/simdag_private.h"
-#include "simgrid/simdag.h"
-#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)");
 
@@ -1079,5 +1077,5 @@ void SD_task_schedulel(SD_task_t task, int count, ...)
 
   va_end(ap);
   SD_task_schedulev(task, count, list);
-  free(list);
+  xbt_free(list);
 }
diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index e652ea130e..a450564a32 100644
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -13,6 +13,9 @@
 #include "surf/surf.h"
 #include "xbt/mallocator.h"
 #include <stdbool.h>
+#if HAVE_JEDULE
+#include "simgrid/jedule/jedule_sd_binding.h"
+#endif
 
 SG_BEGIN_DECL()
 
-- 
2.20.1