X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2696e7d1bca082a983f1887ba14f90543f2cd173..283236f8e2414d7c30d46e6d1aea0e8882699dd1:/testsuite/surf/surf_usage.c

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index a3dc2cabf5..fd40b25fb9 100644
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -11,7 +11,9 @@
 #endif
 
 #include <stdio.h>
+#include "simgrid/sg_config.h"
 #include "surf/surf.h"
+#include "surf/surf_resource.h"
 #include "surf/surfxml_parse.h" // for reset callback
 
 #include "xbt/log.h"
@@ -51,9 +53,8 @@ void test(char *platform)
   e_surf_action_state_t stateActionB;
   e_surf_action_state_t stateActionC;
   double now = -1.0;
-  surf_parse_reset_callbacks();
-  surf_cpu_model_init_Cas01(platform);  /* Now it is possible to use CPUs */
-  surf_network_model_init_CM02(platform);       /* Now it is possible to use eth0 */
+  xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
+  xbt_cfg_set_parse(_sg_cfg_set, "network/model:CM02");
   parse_platform_file(platform);
 
   /*********************** CPU ***********************************/
@@ -62,18 +63,18 @@ void test(char *platform)
   cpuB = surf_cpu_resource_by_name("Cpu B");
 
   /* Let's check that those two processors exist */
-  XBT_DEBUG("%s : %p", surf_resource_name(cpuA), cpuA);
-  XBT_DEBUG("%s : %p", surf_resource_name(cpuB), cpuB);
-
+  XBT_DEBUG("%s : %p", surf_cpu_name(surf_cpu_resource_priv(cpuA)), cpuA);
+  XBT_DEBUG("%s : %p", surf_cpu_name(surf_cpu_resource_priv(cpuB)), cpuB);
+  surf_cpu_resource_priv(cpuA);
   /* Let's do something on it */
-  actionA = surf_cpu_model->extension.cpu.execute(cpuA, 1000.0);
-  actionB = surf_cpu_model->extension.cpu.execute(cpuB, 1000.0);
-  actionC = surf_cpu_model->extension.cpu.sleep(cpuB, 7.32);
+  actionA = surf_cpu_execute(surf_cpu_resource_priv(cpuA), 1000.0);
+  actionB = surf_cpu_execute(surf_cpu_resource_priv(cpuB), 1000.0);
+  actionC = surf_cpu_sleep(surf_cpu_resource_priv(cpuB), 7.32);
 
   /* Use whatever calling style you want... */
-  stateActionA = surf_cpu_model->action_state_get(actionA);     /* When you know actionA model type */
-  stateActionB = actionB->model_type->action_state_get(actionB);        /* If you're unsure about it's model type */
-  stateActionC = surf_cpu_model->action_state_get(actionC);     /* When you know actionA model type */
+  stateActionA = surf_action_get_state(actionA);     /* When you know actionA model type */
+  stateActionB = surf_action_get_state(actionB);        /* If you're unsure about it's model type */
+  stateActionC = surf_action_get_state(actionC);     /* When you know actionA model type */
 
   /* And just look at the state of these tasks */
   XBT_DEBUG("actionA : %p (%s)", actionA, string_action(stateActionA));
@@ -82,16 +83,15 @@ void test(char *platform)
 
   /*********************** Network *******************************/
   XBT_DEBUG("%p", surf_network_model);
-  cardA = surf_network_resource_by_name("Cpu A");
-  cardB = surf_network_resource_by_name("Cpu B");
+  cardA = sg_routing_edge_by_name_or_null("Cpu A");
+  cardB = sg_routing_edge_by_name_or_null("Cpu B");
 
   /* Let's check that those two processors exist */
-  XBT_DEBUG("%s : %p", surf_resource_name(cardA), cardA);
-  XBT_DEBUG("%s : %p", surf_resource_name(cardB), cardB);
+  XBT_DEBUG("%s : %p", surf_routing_edge_name(cardA), cardA);
+  XBT_DEBUG("%s : %p", surf_routing_edge_name(cardB), cardB);
 
   /* Let's do something on it */
-  surf_network_model->extension.network.communicate("Cpu A", "Cpu B",
-                                                    150.0, -1.0);
+  surf_network_model_communicate(surf_network_model, cardA, cardB, 150.0, -1.0);
 
   surf_solve(-1.0);                 /* Takes traces into account. Returns 0.0 */
   do {
@@ -100,31 +100,29 @@ void test(char *platform)
     XBT_DEBUG("Next Event : %g", now);
     XBT_DEBUG("\t CPU actions");
     while ((action =
-            xbt_swag_extract(surf_cpu_model->states.failed_action_set))) {
+            xbt_swag_extract(surf_model_failed_action_set((surf_model_t)surf_cpu_model)))) {
       XBT_DEBUG("\t * Failed : %p", action);
-      action->model_type->action_unref(action);
+      surf_action_unref(action);
     }
     while ((action =
-            xbt_swag_extract(surf_cpu_model->states.done_action_set))) {
+            xbt_swag_extract(surf_model_done_action_set((surf_model_t)surf_cpu_model)))) {
       XBT_DEBUG("\t * Done : %p", action);
-      action->model_type->action_unref(action);
+      surf_action_unref(action);
     }
     XBT_DEBUG("\t Network actions");
     while ((action =
-            xbt_swag_extract(surf_network_model->states.
-                             failed_action_set))) {
+            xbt_swag_extract(surf_model_failed_action_set((surf_model_t)surf_network_model)))) {
       XBT_DEBUG("\t * Failed : %p", action);
-      action->model_type->action_unref(action);
+      surf_action_unref(action);
     }
     while ((action =
-            xbt_swag_extract(surf_network_model->states.
-                             done_action_set))) {
+            xbt_swag_extract(surf_model_done_action_set((surf_model_t)surf_network_model)))) {
       XBT_DEBUG("\t * Done : %p", action);
-      action->model_type->action_unref(action);
+      surf_action_unref(action);
     }
 
-  } while ((xbt_swag_size(surf_network_model->states.running_action_set) ||
-            xbt_swag_size(surf_cpu_model->states.running_action_set)) &&
+  } while ((xbt_swag_size(surf_model_running_action_set((surf_model_t)surf_network_model)) ||
+            xbt_swag_size(surf_model_running_action_set((surf_model_t)surf_cpu_model))) &&
            surf_solve(-1.0) >= 0.0);
 
   XBT_DEBUG("Simulation Terminated");