X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/509304ee1435b62cd49eb9071995fab468f68f58..7989355dfec335e1c7abea0ea90a85dab4a51513:/testsuite/surf/trace_usage.c

diff --git a/testsuite/surf/trace_usage.c b/testsuite/surf/trace_usage.c
index c203163c6c..5b1de6d862 100644
--- a/testsuite/surf/trace_usage.c
+++ b/testsuite/surf/trace_usage.c
@@ -1,47 +1,65 @@
 /* A few tests for the trace library                                       */
 
-/* Authors: Arnaud Legrand                                                  */
+/* Copyright (c) 2004, 2005, 2006, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "surf/trace_mgr.h"
+#include "surf/surf.h"
+
+#include "xbt/log.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "surf/trace_mgr.h"
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
+                             "Messages specific for surf example");
 
 void test(void);
 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;
+  tmgr_trace_t trace_A = tmgr_trace_new_from_file("trace_A.txt");
+  tmgr_trace_t trace_B = tmgr_trace_new_from_file("trace_B.txt");
+  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");
 
   tmgr_history_add_trace(history, trace_A, 1.0, 2, host_A);
   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);
-    while(tmgr_history_get_next_event_leq(history, next_event_date,
-					  &value, (void**) &resource)){
-      printf("\t %s : " XBT_MAXMIN_FLOAT_T "\n",resource,value);
+
+  while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+    XBT_DEBUG("%g" " : \n", next_event_date);
+    while (tmgr_history_get_next_event_leq(history, next_event_date,
+                                           &value, (void **) &resource)) {
+      XBT_DEBUG("\t %s : " "%g" "\n", resource, value);
     }
-    if(next_event_date>1000) break;
+    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);
+}
+
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
 
 
 int main(int argc, char **argv)
 {
+  surf_init(&argc, argv);
   test();
+  surf_exit();
   return 0;
 }