X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/06f0d1d110338b3eb607633583183a076f7d2722..97205f69c3ff45b271a439e9feedd372c587656e:/testsuite/surf/trace_usage.c

diff --git a/testsuite/surf/trace_usage.c b/testsuite/surf/trace_usage.c
index 2253e4dfc4..5b1de6d862 100644
--- a/testsuite/surf/trace_usage.c
+++ b/testsuite/surf/trace_usage.c
@@ -1,27 +1,32 @@
-/* 	$Id$	 */
-
 /* A few tests for the trace library                                       */
 
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* 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. */
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
 
-#include <stdlib.h>
-#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");
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.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");
+  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;
@@ -32,26 +37,29 @@ 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) {
-    DEBUG1("%lg" " : \n", next_event_date);
+    XBT_DEBUG("%g" " : \n", next_event_date);
     while (tmgr_history_get_next_event_leq(history, next_event_date,
-					   &value, (void **) &resource)) {
-      DEBUG2("\t %s : " "%lg" "\n", resource, value);
+                                           &value, (void **) &resource)) {
+      XBT_DEBUG("\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);
 }
 
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
+
 
 int main(int argc, char **argv)
 {
-  surf_init(&argc,argv);
+  surf_init(&argc, argv);
   test();
+  surf_exit();
   return 0;
 }