X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..7989355dfec335e1c7abea0ea90a85dab4a51513:/testsuite/surf/surf_usage.c diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index 1bc9289bee..e95bd142d2 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -12,9 +12,12 @@ #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) @@ -45,25 +48,22 @@ 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_model_init_Cas01(platform); /* Now it is possible to use CPUs */ - surf_network_model_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", surf_cpu_model); - cpuA = surf_model_resource_by_name(surf_cpu_model,"Cpu A"); - cpuB = surf_model_resource_by_name(surf_cpu_model,"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",surf_resource_name(cpuA), cpuA); - DEBUG2("%s : %p",surf_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_model->extension.cpu.execute(cpuA, 1000.0); @@ -71,62 +71,63 @@ void test(char *platform) actionC = surf_cpu_model->extension.cpu.sleep(cpuB, 7.32); /* Use whatever calling style you want... */ - 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 */ + 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)", actionA, string_action(stateActionA)); - DEBUG2("actionB : %p (%s)", actionB, string_action(stateActionB)); - DEBUG2("actionC : %p (%s)", 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", surf_network_model); - cardA = surf_model_resource_by_name(surf_network_model,"Cpu A"); - cardB = surf_model_resource_by_name(surf_network_model,"Cpu B"); + XBT_DEBUG("%p", surf_network_model); + cardA = sg_routing_edge_by_name_or_null("Cpu A"); + cardB = sg_routing_edge_by_name_or_null("Cpu B"); /* Let's check that those two processors exist */ - DEBUG2("%s : %p", surf_resource_name(cardA), cardA); - DEBUG2("%s : %p", surf_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_model->extension.network.communicate("Cpu A","Cpu B", 0, 1, /* FIXME: hardcoding host number is bad */ - 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", now); - DEBUG0("\t CPU actions"); + XBT_DEBUG("Next Event : %g", now); + XBT_DEBUG("\t CPU actions"); while ((action = xbt_swag_extract(surf_cpu_model->states.failed_action_set))) { - DEBUG1("\t * Failed : %p", action); + XBT_DEBUG("\t * Failed : %p", action); action->model_type->action_unref(action); } while ((action = xbt_swag_extract(surf_cpu_model->states.done_action_set))) { - DEBUG1("\t * Done : %p", action); + XBT_DEBUG("\t * Done : %p", action); action->model_type->action_unref(action); } - DEBUG0("\t Network actions"); + XBT_DEBUG("\t Network actions"); while ((action = - xbt_swag_extract(surf_network_model->states.failed_action_set))) { - DEBUG1("\t * Failed : %p", 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_model->states.done_action_set))) { - DEBUG1("\t * Done : %p", action); + xbt_swag_extract(surf_network_model->states. + done_action_set))) { + XBT_DEBUG("\t * Done : %p", action); action->model_type->action_unref(action); } } while ((xbt_swag_size(surf_network_model->states.running_action_set) || xbt_swag_size(surf_cpu_model->states.running_action_set)) && - surf_solve() >= 0.0); + surf_solve(-1.0) >= 0.0); - DEBUG0("Simulation Terminated"); + XBT_DEBUG("Simulation Terminated"); } #ifdef __BORLANDC__