Replace surf by surf++ and make it compile

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

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 4c92bea..9ff6cb8 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -62,12 +62,11 @@ void test(char *platform)
   XBT_DEBUG("%s : %p", surf_resource_name(workstationB), workstationB);
 
   /* Let's do something on it */
-  surf_workstation_model->extension.workstation.execute(workstationA, 1000.0);
-  surf_workstation_model->extension.workstation.execute(workstationB, 1000.0);
-      surf_workstation_model->extension.workstation.sleep(workstationB, 7.32);
+  surf_workstation_execute(workstationA, 1000.0);
+  surf_workstation_execute(workstationB, 1000.0);
+  surf_workstation_sleep(workstationB, 7.32);
 
-  surf_workstation_model->extension.workstation.
-      communicate(workstationA, workstationB, 150.0, -1.0);
+  surf_workstation_model_communicate(surf_workstation_model, workstationA, workstationB, 150.0, -1.0);
 
   surf_solve(-1.0);                 /* Takes traces into account. Returns 0.0 */
   do {
@@ -80,17 +79,17 @@ void test(char *platform)
     XBT_DEBUG("Next Event : %g", now);
 
     xbt_dynar_foreach(model_list, iter, model) {
-      XBT_DEBUG("\t %s actions", model->name);
-      while ((action = xbt_swag_extract(model->states.failed_action_set))) {
+      XBT_DEBUG("\t %s actions", surf_model_name(model));
+      while ((action = xbt_swag_extract(surf_model_failed_action_set((surf_model_t)model)))) {
         XBT_DEBUG("\t * Failed : %p", action);
-        model->action_unref(action);
+        surf_action_unref(action);
       }
-      while ((action = xbt_swag_extract(model->states.done_action_set))) {
+      while ((action = xbt_swag_extract(surf_model_done_action_set((surf_model_t)model)))) {
         XBT_DEBUG("\t * Done : %p", action);
-        model->action_unref(action);
+        surf_action_unref(action);
       }
-      if (xbt_swag_size(model->states.running_action_set)) {
-        XBT_DEBUG("running %s", model->name);
+      if (xbt_swag_size(surf_model_running_action_set((surf_model_t)model))) {
+        XBT_DEBUG("running %s", surf_model_name(model));
         running = 1;
       }
     }