X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93bfd522e431912cc88a28252eb9bc4074c991fb..5d02d342bf2942a5e97d9d3599cbb7d94f3285a9:/testsuite/surf/surf_usage.c diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index 23136dd25c..3a104fb0ee 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -10,6 +10,9 @@ #include #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 *cpuA = NULL; void *cpuB = NULL; @@ -44,19 +47,21 @@ void test(void) 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; + 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); + DEBUG1("%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"); /* 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); + DEBUG2("%s : %p\n", + surf_cpu_resource->common_public->get_resource_name(cpuA), cpuA); + DEBUG2("%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); @@ -69,57 +74,74 @@ void test(void) stateActionC = surf_cpu_resource->common_public->action_get_state(actionC); /* When you know actionA resource type */ /* 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)); + DEBUG2("actionA : %p (%s)\n", actionA, string_action(stateActionA)); + DEBUG2("actionB : %p (%s)\n", actionB, string_action(stateActionB)); + DEBUG2("actionC : %p (%s)\n", actionB, string_action(stateActionC)); /*********************** Network *******************************/ - printf("%p \n", surf_network_resource); + DEBUG1("%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); + DEBUG2("%s : %p\n", + surf_network_resource->common_public->get_resource_name(cardA), + cardA); + DEBUG2("%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("\t CPU actions\n"); - while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.failed_action_set)) { - printf("\t * Failed : %p\n", action); + DEBUG1("Next Event : " "%g" "\n", now); + DEBUG0("\t CPU actions\n"); + while ((action = + xbt_swag_extract(surf_cpu_resource->common_public->states. + failed_action_set))) { + DEBUG1("\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); + while ((action = + xbt_swag_extract(surf_cpu_resource->common_public->states. + done_action_set))) { + DEBUG1("\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); + DEBUG0("\t Network actions\n"); + while ((action = + xbt_swag_extract(surf_network_resource->common_public->states. + failed_action_set))) { + DEBUG1("\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)) { - printf("\t * Done : %p\n", action); + while ((action = + xbt_swag_extract(surf_network_resource->common_public->states. + done_action_set))) { + DEBUG1("\t * Done : %p\n", action); action->resource_type->common_public->action_free(action); } - } while(surf_solve()); - - printf("Simulation Terminated\n"); + } while (surf_solve()>=0.0); - surf_finalize(); + DEBUG0("Simulation Terminated\n"); } - 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]); + + surf_exit(); return 0; }