X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..4da90af7c446df38e61a9e3f1ee5f698903cfc6d:/testsuite/surf/surf_usage.c

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index e16a8a8aab..3222d6a1a3 100644
--- 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;
@@ -39,13 +39,15 @@ void test(void)
   void *cardB = NULL;
   surf_action_t actionA = NULL;
   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;
-  xbt_maxmin_float_t now = -1.0;
+  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);
@@ -53,20 +55,25 @@ void test(void)
   cpuB = surf_cpu_resource->common_public->name_service("Cpu B");
 
   /* Let's check that those two processors exist */
-  printf("%s : %p\n", surf_cpu_resource->common_public->get_resource_name(cpuA), cpuA);
-  printf("%s : %p\n", surf_cpu_resource->common_public->get_resource_name(cpuB), cpuB);
+  printf("%s : %p\n",
+	 surf_cpu_resource->common_public->get_resource_name(cpuA), cpuA);
+  printf("%s : %p\n",
+	 surf_cpu_resource->common_public->get_resource_name(cpuB), cpuB);
 
   /* Let's do something on it */
   actionA = surf_cpu_resource->extension_public->execute(cpuA, 1000.0);
   actionB = surf_cpu_resource->extension_public->execute(cpuB, 1000.0);
+  actionC = surf_cpu_resource->extension_public->sleep(cpuB, 7.32);
 
   /* Use whatever calling style you want... */
   stateActionA = surf_cpu_resource->common_public->action_get_state(actionA);	/* When you know actionA resource type */
   stateActionB = actionB->resource_type->common_public->action_get_state(actionB);	/* If you're unsure about it's resource type */
+  stateActionC = surf_cpu_resource->common_public->action_get_state(actionC);	/* When you know actionA resource type */
 
-  /* And just look at the stat of these tasks */
+  /* And just look at the state of these tasks */
   printf("actionA : %p (%s)\n", actionA, string_action(stateActionA));
   printf("actionB : %p (%s)\n", actionB, string_action(stateActionB));
+  printf("actionC : %p (%s)\n", actionB, string_action(stateActionC));
 
   /*********************** Network *******************************/
   printf("%p \n", surf_network_resource);
@@ -74,47 +81,64 @@ void test(void)
   cardB = surf_network_resource->common_public->name_service("Cpu B");
 
   /* Let's check that those two processors exist */
-  printf("%s : %p\n", surf_network_resource->common_public->get_resource_name(cardA), cardA);
-  printf("%s : %p\n", surf_network_resource->common_public->get_resource_name(cardB), cardB);
+  printf("%s : %p\n",
+	 surf_network_resource->common_public->get_resource_name(cardA),
+	 cardA);
+  printf("%s : %p\n",
+	 surf_network_resource->common_public->get_resource_name(cardB),
+	 cardB);
 
   /* Let's do something on it */
-  commAB = surf_network_resource->extension_public->communicate(cardA, cardB, 150.0);
+  commAB =
+      surf_network_resource->extension_public->communicate(cardA, cardB,
+							   150.0,-1.0);
 
-  surf_solve(); /* Takes traces into account. Returns 0.0 */
+  surf_solve();			/* Takes traces into account. Returns 0.0 */
   do {
-    surf_action_t action = NULL;    
+    surf_action_t action = NULL;
     now = surf_get_clock();
-    printf("Next Event : " XBT_HEAP_FLOAT_T "\n", now);
+    printf("Next Event : " "%lg" "\n", now);
     printf("\t CPU actions\n");
-    while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.failed_action_set)) {
+    while ((action =
+	    xbt_swag_extract(surf_cpu_resource->common_public->states.
+			     failed_action_set))) {
       printf("\t * Failed : %p\n", action);
       action->resource_type->common_public->action_free(action);
     }
-    while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.done_action_set)) {
+    while ((action =
+	    xbt_swag_extract(surf_cpu_resource->common_public->states.
+			     done_action_set))) {
       printf("\t * Done : %p\n", action);
       action->resource_type->common_public->action_free(action);
     }
     printf("\t Network actions\n");
-    while(action=xbt_swag_extract(surf_network_resource->common_public->states.failed_action_set)) {
+    while ((action =
+	    xbt_swag_extract(surf_network_resource->common_public->states.
+			     failed_action_set))) {
       printf("\t * Failed : %p\n", action);
       action->resource_type->common_public->action_free(action);
     }
-    while(action=xbt_swag_extract(surf_network_resource->common_public->states.done_action_set)) {
+    while ((action =
+	    xbt_swag_extract(surf_network_resource->common_public->states.
+			     done_action_set))) {
       printf("\t * Done : %p\n", action);
       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();
+  surf_init(&argc, argv);	/* Initialize some common structures */
+  if(argc==1) {
+     fprintf(stderr,"Usage : %s platform.txt\n",argv[0]);
+     return 1;
+  }
+  test(argv[1]);
   return 0;
 }