X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d25ee31741e8dd64436721b11fe82a0969f369cf..cf9f395602a8127a0f48f48819d03b7b597dbb44:/testsuite/surf/surf_usage.c diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index 0577f21822..6d5b8c8ddc 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -6,10 +6,17 @@ /* 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. */ + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif #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) { @@ -29,9 +36,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; @@ -46,96 +52,105 @@ void test(void) 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_model_init_Cas01(platform); /* Now it is possible to use CPUs */ + surf_network_model_init_CM02(platform); /* Now it is possible to use eth0 */ + + parse_platform_file(platform); /*********************** 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"); + DEBUG1("%p \n", surf_cpu_model); + cpuA = surf_cpu_model->common_public->name_service("Cpu A"); + cpuB = surf_cpu_model->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_model->common_public->get_resource_name(cpuA), cpuA); + DEBUG2("%s : %p\n", + surf_cpu_model->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); + actionA = surf_cpu_model->extension_public->execute(cpuA, 1000.0); + actionB = surf_cpu_model->extension_public->execute(cpuB, 1000.0); + actionC = surf_cpu_model->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 */ + stateActionA = surf_cpu_model->common_public->action_get_state(actionA); /* When you know actionA model type */ + stateActionB = actionB->model_type->common_public->action_get_state(actionB); /* If you're unsure about it's model type */ + stateActionC = surf_cpu_model->common_public->action_get_state(actionC); /* When you know actionA model 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); - cardA = surf_network_resource->common_public->name_service("Cpu A"); - cardB = surf_network_resource->common_public->name_service("Cpu B"); + DEBUG1("%p \n", surf_network_model); + cardA = surf_network_model->common_public->name_service("Cpu A"); + cardB = surf_network_model->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), + DEBUG2("%s : %p\n", + surf_network_model->common_public->get_resource_name(cardA), cardA); - printf("%s : %p\n", - surf_network_resource->common_public->get_resource_name(cardB), + DEBUG2("%s : %p\n", + surf_network_model->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_network_model->extension_public->communicate(cardA, cardB, + 150.0,-1.0); surf_solve(); /* Takes traces into account. Returns 0.0 */ do { surf_action_t action = NULL; now = surf_get_clock(); - printf("Next Event : " "%lg" "\n", now); - printf("\t CPU actions\n"); + DEBUG1("Next Event : " "%g" "\n", now); + DEBUG0("\t CPU actions\n"); while ((action = - xbt_swag_extract(surf_cpu_resource->common_public->states. + xbt_swag_extract(surf_cpu_model->common_public->states. failed_action_set))) { - printf("\t * Failed : %p\n", action); - action->resource_type->common_public->action_free(action); + DEBUG1("\t * Failed : %p\n", action); + action->model_type->common_public->action_free(action); } while ((action = - xbt_swag_extract(surf_cpu_resource->common_public->states. + xbt_swag_extract(surf_cpu_model->common_public->states. done_action_set))) { - printf("\t * Done : %p\n", action); - action->resource_type->common_public->action_free(action); + DEBUG1("\t * Done : %p\n", action); + action->model_type->common_public->action_free(action); } - printf("\t Network actions\n"); + DEBUG0("\t Network actions\n"); while ((action = - xbt_swag_extract(surf_network_resource->common_public->states. + xbt_swag_extract(surf_network_model->common_public->states. failed_action_set))) { - printf("\t * Failed : %p\n", action); - action->resource_type->common_public->action_free(action); + DEBUG1("\t * Failed : %p\n", action); + action->model_type->common_public->action_free(action); } while ((action = - xbt_swag_extract(surf_network_resource->common_public->states. + xbt_swag_extract(surf_network_model->common_public->states. done_action_set))) { - printf("\t * Done : %p\n", action); - action->resource_type->common_public->action_free(action); + DEBUG1("\t * Done : %p\n", action); + action->model_type->common_public->action_free(action); } - } while (surf_solve()); + } while (surf_solve()>=0.0); - printf("Simulation Terminated\n"); - - surf_finalize(); + DEBUG0("Simulation Terminated\n"); } +#ifdef __BORLANDC__ +#pragma argsused +#endif int main(int argc, char **argv) { surf_init(&argc, argv); /* Initialize some common structures */ - test(); + if(argc==1) { + fprintf(stderr,"Usage : %s platform.xml\n",argv[0]); + return 1; + } + test(argv[1]); + + surf_exit(); return 0; }