resource file of context usage project

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

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index be028d2..2adbbad 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -10,6 +10,9 @@
 #include <stdio.h>
 #include "surf/surf.h"
 
+#include "xbt/log.h"
+XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,"Messages specific for surf example");
+
 const char *string_action(e_surf_action_state_t state);
 const char *string_action(e_surf_action_state_t state)
 {
@@ -39,12 +42,9 @@ void test(char *platform)
   surf_action_t actionB = NULL;
   surf_action_t actionC = NULL;
   surf_action_t commAB = NULL;
-  e_surf_action_state_t stateActionA;
-  e_surf_action_state_t stateActionB;
-  e_surf_action_state_t stateActionC;
   double now = -1.0;
 
-  surf_workstation_resource_init(platform);
+  surf_workstation_resource_init_CLM03(platform);
 
   /*********************** WORKSTATION ***********************************/
   workstationA =
@@ -53,10 +53,10 @@ void test(char *platform)
       surf_workstation_resource->common_public->name_service("Cpu B");
 
   /* Let's check that those two processors exist */
-  printf("%s : %p\n",
+  DEBUG2("%s : %p\n",
         surf_workstation_resource->common_public->
         get_resource_name(workstationA), workstationA);
-  printf("%s : %p\n",
+  DEBUG2("%s : %p\n",
         surf_workstation_resource->common_public->
         get_resource_name(workstationB), workstationB);
 
@@ -73,7 +73,7 @@ void test(char *platform)
 
   commAB =
       surf_workstation_resource->extension_public->
-      communicate(workstationA, workstationB, 150.0);
+      communicate(workstationA, workstationB, 150.0, -1.0);
 
   surf_solve();                        /* Takes traces into account. Returns 0.0 */
   do {
@@ -82,28 +82,27 @@ void test(char *platform)
     surf_resource_t resource = NULL;
 
     now = surf_get_clock();
-    printf("Next Event : " "%lg" "\n", now);
+    DEBUG1("Next Event : " "%g" "\n", now);
 
     xbt_dynar_foreach(resource_list, i, resource) {
-      printf("\t %s actions\n", resource->common_public->name);
+      DEBUG1("\t %s actions\n", resource->common_public->name);
       while ((action =
             xbt_swag_extract(resource->common_public->states.
                              failed_action_set))) {
-       printf("\t * Failed : %p\n", action);
+       DEBUG1("\t * Failed : %p\n", action);
        resource->common_public->action_free(action);
       }
       while ((action =
             xbt_swag_extract(resource->common_public->states.
                              done_action_set))) {
-       printf("\t * Done : %p\n", action);
+       DEBUG1("\t * Done : %p\n", action);
        resource->common_public->action_free(action);
       }
     }
   } while (surf_solve()>=0.0);
 
-  printf("Simulation Terminated\n");
+  DEBUG0("Simulation Terminated\n");
 
-  surf_finalize();
 }
 
 int main(int argc, char **argv)
@@ -111,8 +110,11 @@ int main(int argc, char **argv)
   surf_init(&argc, argv);      /* Initialize some common structures */
   if(argc==1) {
      fprintf(stderr,"Usage : %s platform.txt\n",argv[0]);
+     surf_exit();
      return 1;
   }
   test(argv[1]);
+
+  surf_exit();
   return 0;
 }