From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 18 Sep 2007 10:20:47 +0000 (+0000)
Subject: model->resource when needed...
X-Git-Tag: v3.3~1148
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/db7e2db2bb48fbf6c4b6cdb22a7d66a476de9580

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 c13cd913df..acb911930d 100644
--- 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",
-	 surf_cpu_model->common_public->get_model_name(cpuA), cpuA);
+	 surf_cpu_model->common_public->get_resource_name(cpuA), cpuA);
   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);
@@ -88,10 +88,10 @@ void test(char *platform)
 
   /* 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",
-	 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 */
diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 443e5e18eb..762fedbbbf 100644
--- 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->
-	 get_model_name(workstationA), workstationA);
+	 get_resource_name(workstationA), workstationA);
   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 =