Renamed resource initialization functions. Now they are postfixed by a alpha-style...

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

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index 0577f21..5d4c577 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -30,8 +30,8 @@ const char *string_action(e_surf_action_state_t state)
 }
 
 
-void test(void);
-void test(void)
+void test(char *platform);
+void test(char *platform)
 {
   void *cpuA = NULL;
   void *cpuB = NULL;
@@ -46,8 +46,8 @@ void test(void)
   e_surf_action_state_t stateActionC;
   double now = -1.0;
 
-  surf_cpu_resource_init("platform.txt");      /* Now it is possible to use CPUs */
-  surf_network_resource_init("platform.txt");  /* Now it is possible to use eth0 */
+  surf_cpu_resource_init_Cas01(platform);      /* Now it is possible to use CPUs */
+  surf_network_resource_init_CM02(platform);   /* Now it is possible to use eth0 */
 
   /*********************** CPU ***********************************/
   printf("%p \n", surf_cpu_resource);
@@ -125,17 +125,20 @@ void test(void)
       action->resource_type->common_public->action_free(action);
     }
 
-  } while (surf_solve());
+  } while (surf_solve()>=0.0);
 
   printf("Simulation Terminated\n");
 
   surf_finalize();
 }
 
-
 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);      /* Initialize some common structures */
-  test();
+  if(argc==1) {
+     fprintf(stderr,"Usage : %s platform.txt\n",argv[0]);
+     return 1;
+  }
+  test(argv[1]);
   return 0;
 }