grades overrun in test_heap_mean_operation() test funtion, adds test_reset_heap...

[simgrid.git] / testsuite / surf / trace_usage.c

diff --git a/testsuite/surf/trace_usage.c b/testsuite/surf/trace_usage.c
index 157ee5b..9232409 100644 (file)
--- a/testsuite/surf/trace_usage.c
+++ b/testsuite/surf/trace_usage.c
@@ -11,6 +11,10 @@
 #include <stdio.h>
 #include <string.h>
 #include "surf/trace_mgr.h"
+#include "surf/surf.h"
+
+#include "xbt/log.h"
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,"Messages specific for surf example");
 
 void test(void);
 void test(void)
@@ -18,8 +22,8 @@ void test(void)
   tmgr_history_t history = tmgr_history_new();
   tmgr_trace_t trace_A = tmgr_trace_new("trace_A.txt");
   tmgr_trace_t trace_B = tmgr_trace_new("trace_B.txt");
-  xbt_heap_float_t next_event_date = -1.0;
-  xbt_maxmin_float_t value = -1.0;
+  double next_event_date = -1.0;
+  double value = -1.0;
   char *resource = NULL;
   char *host_A = strdup("Host A");
   char *host_B = strdup("Host B");
@@ -28,17 +32,15 @@ void test(void)
   tmgr_history_add_trace(history, trace_B, 0.0, 0, host_B);
 
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
-    printf(XBT_HEAP_FLOAT_T " : \n", next_event_date);
+    DEBUG1("%g" " : \n", next_event_date);
     while (tmgr_history_get_next_event_leq(history, next_event_date,
                                           &value, (void **) &resource)) {
-      printf("\t %s : " XBT_MAXMIN_FLOAT_T "\n", resource, value);
+      DEBUG2("\t %s : " "%g" "\n", resource, value);
     }
     if (next_event_date > 1000)
       break;
   }
 
-  tmgr_trace_free(trace_A);
-  tmgr_trace_free(trace_B);
   tmgr_history_free(history);
   free(host_B);
   free(host_A);
@@ -47,6 +49,8 @@ void test(void)
 
 int main(int argc, char **argv)
 {
+  surf_init(&argc,argv);
   test();
+  surf_exit();
   return 0;
 }