X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15807bea7353de99396547e065c5d33bbf75ce56..2728e49797bd42f623228fe493854ceaaefd7082:/testsuite/surf/surf_usage.c diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index 72fd63556f..c3cb03b0da 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -40,7 +40,8 @@ void test(void) 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 CPUs */ printf("%p \n", surf_cpu_resource); cpuA = surf_cpu_resource->common_public->name_service("Cpu A"); @@ -69,13 +70,17 @@ void test(void) 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); + 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); + action->resource_type->common_public->action_free(action); } } while(surf_solve()); printf("Simulation Terminated\n"); + + surf_finalize(); }