X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecdf7e8bc363f24b9e47e7be7291fed08419b97c..06f0d1d110338b3eb607633583183a076f7d2722:/testsuite/surf/surf_usage2.c

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 66c09fe8fe..36da616329 100644
--- 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)
 {
@@ -30,8 +33,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;
@@ -44,7 +47,7 @@ void test(void)
   e_surf_action_state_t stateActionC;
   double now = -1.0;
 
-  surf_workstation_resource_init("platform.txt");
+  surf_workstation_resource_init_CLM03(platform);
 
   /*********************** WORKSTATION ***********************************/
   workstationA =
@@ -53,10 +56,10 @@ void test(void)
       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 +76,7 @@ void test(void)
 
   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,34 +85,37 @@ void test(void)
     surf_resource_t resource = NULL;
 
     now = surf_get_clock();
-    printf("Next Event : " "%lg" "\n", now);
+    DEBUG1("Next Event : " "%lg" "\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());
+  } while (surf_solve()>=0.0);
 
-  printf("Simulation Terminated\n");
+  DEBUG0("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;
 }