X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15807bea7353de99396547e065c5d33bbf75ce56..a42375c122cde29e0da1b28730b11624a5a38da7:/testsuite/surf/surf_usage.c

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index 72fd63556f..a4b030d4ac 100644
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -1,9 +1,11 @@
+/* 	$Id$	 */
+
 /* A few basic tests for the surf library                                   */
 
-/* Authors: Arnaud Legrand                                                  */
+/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
 #include "surf/surf.h"
@@ -33,15 +35,21 @@ void test(void)
 {
   void *cpuA = NULL;
   void *cpuB = NULL;
+  void *cardA = NULL;
+  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;
+  e_surf_action_state_t stateActionC;
   xbt_maxmin_float_t now = -1.0;
 
-  surf_init(); /* Initialize some common structures */
-  surf_cpu_resource_init(NULL); /* Now it is possible to use CPUs */
+  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 */
 
+  /*********************** CPU ***********************************/
   printf("%p \n", surf_cpu_resource);
   cpuA = surf_cpu_resource->common_public->name_service("Cpu A");
   cpuB = surf_cpu_resource->common_public->name_service("Cpu B");
@@ -53,34 +61,65 @@ void test(void)
   /* 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);
+  cardA = surf_network_resource->common_public->name_service("Cpu A");
+  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);
+
+  /* Let's do something on it */
+  commAB = surf_network_resource->extension_public->communicate(cardA, cardB, 150.0);
 
   surf_solve(); /* Takes traces into account. Returns 0.0 */
   do {
     surf_action_t action = NULL;    
     now = surf_get_clock();
     printf("Next Event : " XBT_HEAP_FLOAT_T "\n", now);
-    while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.failed_action_set)) {
-      printf("\tFailed : %p\n", action);
+    printf("\t CPU actions\n");
+    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))) {
+      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))) {
+      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)) {
-      printf("\tDone : %p\n", action);
+    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());
 
   printf("Simulation Terminated\n");
+
+  surf_finalize();
 }
 
 
 int main(int argc, char **argv)
 {
+  surf_init(&argc, argv); /* Initialize some common structures */
   test();
   return 0;
 }