Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / teshsuite / surf / trace_usage / trace_usage.cpp

diff --git a/teshsuite/surf/trace_usage/trace_usage.cpp b/teshsuite/surf/trace_usage/trace_usage.cpp
index d6f648c..6b04385 100644 (file)
--- a/teshsuite/surf/trace_usage/trace_usage.cpp
+++ b/teshsuite/surf/trace_usage/trace_usage.cpp
@@ -7,17 +7,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf/surf.h"
-
 #include "xbt/log.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "src/surf/network_cm02.hpp"
+#include "src/surf/network_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
-                             "Messages specific for surf example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
 
 class DummyTestResource
     : public simgrid::surf::Resource {
@@ -27,8 +21,10 @@ public:
   void apply_event(tmgr_trace_iterator_t it, double value) override {}
 };
 
-static void test(void)
+int main(int argc, char **argv)
 {
+  surf_init(&argc, argv);
+
   simgrid::trace_mgr::future_evt_set *fes = new simgrid::trace_mgr::future_evt_set();
   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");
@@ -42,23 +38,18 @@ static void test(void)
   fes->add_trace(trace_B, 0.0, hostB);
 
   while ((next_event_date = fes->next_date()) != -1.0) {
-    XBT_DEBUG("%g" " : \n", next_event_date);
+    XBT_INFO("%g:", next_event_date);
     while (fes->pop_leq(next_event_date, &value, &resource)) {
-      XBT_DEBUG("\t %s : " "%g" "\n", resource->getName(), value);
+      XBT_INFO("   %s: %g", resource->getName(), value);
     }
-    if (next_event_date > 1000)
+    if (next_event_date > 100)
       break;
   }
 
   delete fes;
   delete hostA;
   delete hostB;
-}
 
-int main(int argc, char **argv)
-{
-  surf_init(&argc, argv);
-  test();
   surf_exit();
   return 0;
 }