Update to lastest changes in SURF

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6429 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index a4d5877..442fe61 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -59,24 +59,22 @@ void test(char *platform)
 
   /*********************** CPU ***********************************/
   DEBUG1("%p", surf_cpu_model);
-  cpuA = surf_cpu_model->common_public->name_service("Cpu A");
-  cpuB = surf_cpu_model->common_public->name_service("Cpu B");
+  cpuA = surf_model_resource_by_name(surf_cpu_model,"Cpu A");
+  cpuB = surf_model_resource_by_name(surf_cpu_model,"Cpu B");
 
   /* Let's check that those two processors exist */
-  DEBUG2("%s : %p",
-         surf_cpu_model->common_public->get_resource_name(cpuA), cpuA);
-  DEBUG2("%s : %p",
-         surf_cpu_model->common_public->get_resource_name(cpuB), cpuB);
+  DEBUG2("%s : %p",surf_resource_name(cpuA), cpuA);
+  DEBUG2("%s : %p",surf_resource_name(cpuB), cpuB);
 
   /* Let's do something on it */
-  actionA = surf_cpu_model->extension_public->execute(cpuA, 1000.0);
-  actionB = surf_cpu_model->extension_public->execute(cpuB, 1000.0);
-  actionC = surf_cpu_model->extension_public->sleep(cpuB, 7.32);
+  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);
 
   /* Use whatever calling style you want... */
-  stateActionA = surf_cpu_model->common_public->action_get_state(actionA);      /* When you know actionA model type */
-  stateActionB = actionB->model_type->common_public->action_get_state(actionB); /* If you're unsure about it's model type */
-  stateActionC = surf_cpu_model->common_public->action_get_state(actionC);      /* When you know actionA model type */
+  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 */
 
   /* And just look at the state of these tasks */
   DEBUG2("actionA : %p (%s)", actionA, string_action(stateActionA));
@@ -85,18 +83,16 @@ void test(char *platform)
 
   /*********************** Network *******************************/
   DEBUG1("%p", surf_network_model);
-  cardA = surf_network_model->common_public->name_service("Cpu A");
-  cardB = surf_network_model->common_public->name_service("Cpu B");
+  cardA = surf_model_resource_by_name(surf_network_model,"Cpu A");
+  cardB = surf_model_resource_by_name(surf_network_model,"Cpu B");
 
   /* Let's check that those two processors exist */
-  DEBUG2("%s : %p",
-         surf_network_model->common_public->get_resource_name(cardA), cardA);
-  DEBUG2("%s : %p",
-         surf_network_model->common_public->get_resource_name(cardB), cardB);
+  DEBUG2("%s : %p", surf_resource_name(cardA), cardA);
+  DEBUG2("%s : %p", surf_resource_name(cardB), cardB);
 
   /* Let's do something on it */
   commAB =
-    surf_network_model->extension_public->communicate(cardA, cardB,
+    surf_network_model->extension.network.communicate(cardA, cardB,
                                                       150.0, -1.0);
 
   surf_solve();                 /* Takes traces into account. Returns 0.0 */
@@ -106,29 +102,25 @@ void test(char *platform)
     DEBUG1("Next Event : %g", now);
     DEBUG0("\t CPU actions");
     while ((action =
-            xbt_swag_extract(surf_cpu_model->common_public->
-                             states.failed_action_set))) {
+            xbt_swag_extract(surf_cpu_model->states.failed_action_set))) {
       DEBUG1("\t * Failed : %p", action);
-      action->model_type->common_public->action_unref(action);
+      action->model_type->action_unref(action);
     }
     while ((action =
-            xbt_swag_extract(surf_cpu_model->common_public->
-                             states.done_action_set))) {
+            xbt_swag_extract(surf_cpu_model->states.done_action_set))) {
       DEBUG1("\t * Done : %p", action);
-      action->model_type->common_public->action_unref(action);
+      action->model_type->action_unref(action);
     }
     DEBUG0("\t Network actions");
     while ((action =
-            xbt_swag_extract(surf_network_model->common_public->
-                             states.failed_action_set))) {
+            xbt_swag_extract(surf_network_model->states.failed_action_set))) {
       DEBUG1("\t * Failed : %p", action);
-      action->model_type->common_public->action_unref(action);
+      action->model_type->action_unref(action);
     }
     while ((action =
-            xbt_swag_extract(surf_network_model->common_public->
-                             states.done_action_set))) {
+            xbt_swag_extract(surf_network_model->states.done_action_set))) {
       DEBUG1("\t * Done : %p", action);
-      action->model_type->common_public->action_unref(action);
+      action->model_type->action_unref(action);
     }
 
   } while (surf_solve() >= 0.0);

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 8201a45..6f77366 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -50,33 +50,29 @@ void test(char *platform)
   int workstation_id =
     find_model_description(surf_workstation_model_description, "CLM03");
 
-  surf_workstation_model_description[workstation_id].model_init(platform);
+  surf_workstation_model_description[workstation_id].model_init_preparse(platform);
   parse_platform_file(platform);
-  if (surf_workstation_model_description[workstation_id].create_ws)
-    surf_workstation_model_description[workstation_id].create_ws();
+  if (surf_workstation_model_description[workstation_id].model_init_postparse)
+    surf_workstation_model_description[workstation_id].model_init_postparse();
 
   /*********************** WORKSTATION ***********************************/
-  workstationA = surf_workstation_model->common_public->name_service("Cpu A");
-  workstationB = surf_workstation_model->common_public->name_service("Cpu B");
+  workstationA = surf_model_resource_by_name(surf_workstation_model,"Cpu A");
+  workstationB = surf_model_resource_by_name(surf_workstation_model,"Cpu B");
 
   /* Let's check that those two processors exist */
-  DEBUG2("%s : %p",
-         surf_workstation_model->
-         common_public->get_resource_name(workstationA), workstationA);
-  DEBUG2("%s : %p",
-         surf_workstation_model->
-         common_public->get_resource_name(workstationB), workstationB);
+  DEBUG2("%s : %p", surf_resource_name(workstationA), workstationA);
+  DEBUG2("%s : %p", surf_resource_name(workstationB), workstationB);
 
   /* Let's do something on it */
   actionA =
-    surf_workstation_model->extension_public->execute(workstationA, 1000.0);
+    surf_workstation_model->extension.workstation.execute(workstationA, 1000.0);
   actionB =
-    surf_workstation_model->extension_public->execute(workstationB, 1000.0);
+    surf_workstation_model->extension.workstation.execute(workstationB, 1000.0);
   actionC =
-    surf_workstation_model->extension_public->sleep(workstationB, 7.32);
+    surf_workstation_model->extension.workstation.sleep(workstationB, 7.32);
 
   commAB =
-    surf_workstation_model->extension_public->communicate(workstationA,
+    surf_workstation_model->extension.workstation.communicate(workstationA,
                                                           workstationB, 150.0,
                                                           -1.0);
 
@@ -90,18 +86,16 @@ void test(char *platform)
     DEBUG1("Next Event : %g", now);
 
     xbt_dynar_foreach(model_list, iter, model) {
-      DEBUG1("\t %s actions", model->common_public->name);
+      DEBUG1("\t %s actions", model->name);
       while ((action =
-              xbt_swag_extract(model->common_public->
-                               states.failed_action_set))) {
+              xbt_swag_extract(model->states.failed_action_set))) {
         DEBUG1("\t * Failed : %p", action);
-        model->common_public->action_unref(action);
+        model->action_unref(action);
       }
       while ((action =
-              xbt_swag_extract(model->common_public->
-                               states.done_action_set))) {
+              xbt_swag_extract(model->states.done_action_set))) {
         DEBUG1("\t * Done : %p", action);
-        model->common_public->action_unref(action);
+        model->action_unref(action);
       }
     }
   } while (surf_solve() >= 0.0);