[trace] let user specify color for user variables for hosts/links

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

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 7c308ad..3dcab96 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -42,10 +42,6 @@ void test(char *platform)
 {
   void *workstationA = NULL;
   void *workstationB = NULL;
-  surf_action_t actionA = NULL;
-  surf_action_t actionB = NULL;
-  surf_action_t actionC = NULL;
-  surf_action_t commAB = NULL;
   double now = -1.0;
   int running;
 
@@ -62,27 +58,20 @@ void test(char *platform)
 
   /*********************** WORKSTATION ***********************************/
   workstationA =
-      surf_model_resource_by_name(surf_workstation_model, "Cpu A");
+      surf_workstation_resource_by_name("Cpu A");
   workstationB =
-      surf_model_resource_by_name(surf_workstation_model, "Cpu B");
+      surf_workstation_resource_by_name("Cpu B");
 
   /* Let's check that those two processors exist */
   XBT_DEBUG("%s : %p", surf_resource_name(workstationA), workstationA);
   XBT_DEBUG("%s : %p", surf_resource_name(workstationB), workstationB);
 
   /* Let's do something on it */
-  actionA =
-      surf_workstation_model->extension.workstation.execute(workstationA,
-                                                            1000.0);
-  actionB =
-      surf_workstation_model->extension.workstation.execute(workstationB,
-                                                            1000.0);
-  actionC =
-      surf_workstation_model->extension.workstation.sleep(workstationB,
-                                                          7.32);
-
-  commAB =
-      surf_workstation_model->extension.workstation.
+  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_model->extension.workstation.
       communicate(workstationA, workstationB, 150.0, -1.0);
 
   surf_solve(-1.0);                 /* Takes traces into account. Returns 0.0 */