X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc01c6a871dbbfd0cc84e26eb9f94aeb539e613e..aff60c1091a2d608dc5232193afc153b0d07143e:/testsuite/surf/surf_usage2.c

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index eda5f21c4d..7c308ad92b 100644
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include "surf/surf.h"
+#include "surf/surfxml_parse.h" // for reset callback
 
 #include "xbt/log.h"
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,
@@ -50,7 +51,7 @@ void test(char *platform)
 
   int workstation_id =
       find_model_description(surf_workstation_model_description, "CLM03");
-
+  surf_parse_reset_callbacks();
   surf_workstation_model_description[workstation_id].
       model_init_preparse(platform);
   parse_platform_file(platform);
@@ -66,8 +67,8 @@ void test(char *platform)
       surf_model_resource_by_name(surf_workstation_model, "Cpu B");
 
   /* Let's check that those two processors exist */
-  DEBUG2("%s : %p", surf_resource_name(workstationA), workstationA);
-  DEBUG2("%s : %p", surf_resource_name(workstationB), workstationB);
+  XBT_DEBUG("%s : %p", surf_resource_name(workstationA), workstationA);
+  XBT_DEBUG("%s : %p", surf_resource_name(workstationB), workstationB);
 
   /* Let's do something on it */
   actionA =
@@ -84,7 +85,7 @@ void test(char *platform)
       surf_workstation_model->extension.workstation.
       communicate(workstationA, workstationB, 150.0, -1.0);
 
-  surf_solve();                 /* Takes traces into account. Returns 0.0 */
+  surf_solve(-1.0);                 /* Takes traces into account. Returns 0.0 */
   do {
     surf_action_t action = NULL;
     unsigned int iter;
@@ -92,26 +93,26 @@ void test(char *platform)
     running = 0;
 
     now = surf_get_clock();
-    DEBUG1("Next Event : %g", now);
+    XBT_DEBUG("Next Event : %g", now);
 
     xbt_dynar_foreach(model_list, iter, model) {
-      DEBUG1("\t %s actions", model->name);
+      XBT_DEBUG("\t %s actions", model->name);
       while ((action = xbt_swag_extract(model->states.failed_action_set))) {
-        DEBUG1("\t * Failed : %p", action);
+        XBT_DEBUG("\t * Failed : %p", action);
         model->action_unref(action);
       }
       while ((action = xbt_swag_extract(model->states.done_action_set))) {
-        DEBUG1("\t * Done : %p", action);
+        XBT_DEBUG("\t * Done : %p", action);
         model->action_unref(action);
       }
       if (xbt_swag_size(model->states.running_action_set)) {
-        DEBUG1("running %s", model->name);
+        XBT_DEBUG("running %s", model->name);
         running = 1;
       }
     }
-  } while (running && surf_solve() >= 0.0);
+  } while (running && surf_solve(-1.0) >= 0.0);
 
-  DEBUG0("Simulation Terminated");
+  XBT_DEBUG("Simulation Terminated");
 
 }