X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fb5ab7a1b6fc59ea80553579f897faa7c97733b0..8d64537fa596db23d4c097caf2119b666784cce0:/testsuite/surf/surf_usage.c diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index e613e7f2af..2e8c31af48 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -1,17 +1,23 @@ -/* $Id$ */ - /* A few basic tests for the surf library */ -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * 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. */ +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + #include #include "surf/surf.h" +#include "surf/surf_resource.h" +#include "surf/surfxml_parse.h" // for reset callback #include "xbt/log.h" -XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test,"Messages specific for surf example"); +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) @@ -32,7 +38,6 @@ const char *string_action(e_surf_action_state_t state) } } - void test(char *platform); void test(char *platform) { @@ -43,105 +48,101 @@ void test(char *platform) 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; double now = -1.0; - - 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 */ + xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01"); + xbt_cfg_set_parse(_surf_cfg_set, "network/model:CM02"); + parse_platform_file(platform); /*********************** CPU ***********************************/ - 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"); + XBT_DEBUG("%p", surf_cpu_model); + cpuA = surf_cpu_resource_by_name("Cpu A"); + cpuB = surf_cpu_resource_by_name("Cpu B"); /* Let's check that those two processors exist */ - 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); + XBT_DEBUG("%s : %p", surf_resource_name(cpuA), cpuA); + XBT_DEBUG("%s : %p", surf_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.cpu.execute(cpuA, 1000.0); + actionB = surf_cpu_model->extension.cpu.execute(cpuB, 1000.0); + actionC = surf_cpu_model->extension.cpu.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->action_state_get(actionA); /* When you know actionA model type */ + stateActionB = actionB->model_type->action_state_get(actionB); /* If you're unsure about it's model type */ + stateActionC = surf_cpu_model->action_state_get(actionC); /* When you know actionA model type */ /* And just look at the state of these tasks */ - 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)); + XBT_DEBUG("actionA : %p (%s)", actionA, string_action(stateActionA)); + XBT_DEBUG("actionB : %p (%s)", actionB, string_action(stateActionB)); + XBT_DEBUG("actionC : %p (%s)", actionB, string_action(stateActionC)); /*********************** Network *******************************/ - 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"); + XBT_DEBUG("%p", surf_network_model); + cardA = surf_network_resource_by_name("Cpu A"); + cardB = surf_network_resource_by_name("Cpu B"); /* Let's check that those two processors exist */ - 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); + XBT_DEBUG("%s : %p", surf_resource_name(cardA), cardA); + XBT_DEBUG("%s : %p", surf_resource_name(cardB), cardB); /* Let's do something on it */ - commAB = - surf_network_resource->extension_public->communicate(cardA, cardB, - 150.0,-1.0); + surf_network_model->extension.network.communicate(cardA, cardB, + 150.0, -1.0); - surf_solve(); /* Takes traces into account. Returns 0.0 */ + surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */ do { surf_action_t action = NULL; now = surf_get_clock(); - DEBUG1("Next Event : " "%g" "\n", now); - DEBUG0("\t CPU actions\n"); + XBT_DEBUG("Next Event : %g", now); + XBT_DEBUG("\t CPU actions"); 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); + xbt_swag_extract(surf_cpu_model->states.failed_action_set))) { + XBT_DEBUG("\t * Failed : %p", action); + action->model_type->action_unref(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); + xbt_swag_extract(surf_cpu_model->states.done_action_set))) { + XBT_DEBUG("\t * Done : %p", action); + action->model_type->action_unref(action); } - DEBUG0("\t Network actions\n"); + XBT_DEBUG("\t Network actions"); 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); + xbt_swag_extract(surf_network_model->states. + failed_action_set))) { + XBT_DEBUG("\t * Failed : %p", action); + action->model_type->action_unref(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); + xbt_swag_extract(surf_network_model->states. + done_action_set))) { + XBT_DEBUG("\t * Done : %p", action); + action->model_type->action_unref(action); } - } while (surf_solve()>=0.0); + } while ((xbt_swag_size(surf_network_model->states.running_action_set) || + xbt_swag_size(surf_cpu_model->states.running_action_set)) && + surf_solve(-1.0) >= 0.0); - DEBUG0("Simulation Terminated\n"); - - surf_finalize(); + XBT_DEBUG("Simulation Terminated"); } +#ifdef __BORLANDC__ +#pragma argsused +#endif + int main(int argc, char **argv) { - surf_init(&argc, argv); /* Initialize some common structures */ - if(argc==1) { - fprintf(stderr,"Usage : %s platform.txt\n",argv[0]); - return 1; + surf_init(&argc, argv); /* Initialize some common structures */ + if (argc == 1) { + fprintf(stderr, "Usage : %s platform.xml\n", argv[0]); + return 1; } test(argv[1]); + + surf_exit(); return 0; }