X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/beca4657a3cf9a8ef593829ddd5249fcd15899ed..1d6f35064b982906e6931d6e2cfbf22ab51a10b3:/src/surf/surf_timer.c

diff --git a/src/surf/surf_timer.c b/src/surf/surf_timer.c
index 7f0dd60350..9f4d72dc4d 100644
--- a/src/surf/surf_timer.c
+++ b/src/surf/surf_timer.c
@@ -5,11 +5,9 @@
 /* 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 "xbt/ex.h"
 #include "surf_timer_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(timer, surf,
-				"Logging specific to the SURF timer module");
-
 surf_timer_resource_t surf_timer_resource = NULL;
 static tmgr_trace_t empty_trace = NULL;
 static xbt_swag_t command_pending = NULL;
@@ -68,10 +66,10 @@ static int resource_used(void *resource_id)
   return 1;
 }
 
-static void action_free(surf_action_t action)
+static int action_free(surf_action_t action)
 {
   DIE_IMPOSSIBLE;
-  return;
+  return 1;
 }
 
 static void action_cancel(surf_action_t action)
@@ -158,6 +156,9 @@ static int action_is_suspended(surf_action_t action)
 
 static void finalize(void)
 {
+  tmgr_trace_free(empty_trace);
+  empty_trace = NULL;
+
   xbt_swag_free(command_pending);
   xbt_swag_free(command_to_run);