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

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

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index d4ca537..64a68ae 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.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 *workstationA = NULL;
   void *workstationB = NULL;
@@ -42,9 +42,9 @@ void test(void)
   e_surf_action_state_t stateActionA;
   e_surf_action_state_t stateActionB;
   e_surf_action_state_t stateActionC;
-  xbt_maxmin_float_t now = -1.0;
+  double now = -1.0;
 
-  surf_workstation_resource_init("platform.txt");
+  surf_workstation_resource_init_CLM03(platform);
 
   /*********************** WORKSTATION ***********************************/
   workstationA =
@@ -82,34 +82,37 @@ void test(void)
     surf_resource_t resource = NULL;
 
     now = surf_get_clock();
-    printf("Next Event : " XBT_HEAP_FLOAT_T "\n", now);
-    
-    xbt_dynar_foreach (resource_list,i,resource) {
+    printf("Next Event : " "%lg" "\n", now);
+
+    xbt_dynar_foreach(resource_list, i, resource) {
       printf("\t %s actions\n", resource->common_public->name);
-      while (action =
+      while ((action =
             xbt_swag_extract(resource->common_public->states.
-                             failed_action_set)) {
+                             failed_action_set))) {
        printf("\t * Failed : %p\n", action);
        resource->common_public->action_free(action);
       }
-      while (action =
+      while ((action =
             xbt_swag_extract(resource->common_public->states.
-                             done_action_set)) {
+                             done_action_set))) {
        printf("\t * Done : %p\n", action);
        resource->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;
 }