model->resource when needed...

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

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index c13cd91..acb9119 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -62,9 +62,9 @@ void test(char *platform)
 
   /* Let's check that those two processors exist */
   DEBUG2("%s : %p\n",
 
   /* Let's check that those two processors exist */
   DEBUG2("%s : %p\n",

-        surf_cpu_model->common_public->get_model_name(cpuA), cpuA);
+        surf_cpu_model->common_public->get_resource_name(cpuA), cpuA);

   DEBUG2("%s : %p\n",
   DEBUG2("%s : %p\n",

-        surf_cpu_model->common_public->get_model_name(cpuB), cpuB);
+        surf_cpu_model->common_public->get_resource_name(cpuB), cpuB);

 
   /* Let's do something on it */
   actionA = surf_cpu_model->extension_public->execute(cpuA, 1000.0);
 
   /* Let's do something on it */
   actionA = surf_cpu_model->extension_public->execute(cpuA, 1000.0);


@@ -88,10 +88,10 @@ void test(char *platform)
 
   /* Let's check that those two processors exist */
   DEBUG2("%s : %p\n",
 
   /* Let's check that those two processors exist */
   DEBUG2("%s : %p\n",

-        surf_network_model->common_public->get_model_name(cardA),
+        surf_network_model->common_public->get_resource_name(cardA),

         cardA);
   DEBUG2("%s : %p\n",
         cardA);
   DEBUG2("%s : %p\n",

-        surf_network_model->common_public->get_model_name(cardB),
+        surf_network_model->common_public->get_resource_name(cardB),

         cardB);
 
   /* Let's do something on it */
         cardB);
 
   /* Let's do something on it */

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 443e5e1..762fedb 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -58,10 +58,10 @@ void test(char *platform)
   /* Let's check that those two processors exist */
   DEBUG2("%s : %p\n",
         surf_workstation_model->common_public->
   /* Let's check that those two processors exist */
   DEBUG2("%s : %p\n",
         surf_workstation_model->common_public->

-        get_model_name(workstationA), workstationA);
+        get_resource_name(workstationA), workstationA);

   DEBUG2("%s : %p\n",
         surf_workstation_model->common_public->
   DEBUG2("%s : %p\n",
         surf_workstation_model->common_public->

-        get_model_name(workstationB), workstationB);
+        get_resource_name(workstationB), workstationB);

 
   /* Let's do something on it */
   actionA =
 
   /* Let's do something on it */
   actionA =