X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bc50b7468e8ccac4960de9608fa76784549e992..fcccac0b75880ccccc1a4cffc58f20af5121ed5c:/teshsuite/surf/surf_usage/surf_usage.cpp diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp index da0716fa38..333ecff1e9 100644 --- a/teshsuite/surf/surf_usage/surf_usage.cpp +++ b/teshsuite/surf/surf_usage/surf_usage.cpp @@ -1,47 +1,41 @@ /* A few basic tests for the surf library */ -/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ -#include "surf/surf.h" -#include "simgrid/s4u/host.hpp" -#include "simgrid/sg_config.h" +#include "simgrid/host.h" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/surf_interface.hpp" -#include -#include "xbt/log.h" XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); static const char *string_action(simgrid::surf::Action::State state) { switch (state) { - case (simgrid::surf::Action::State::ready): - return "SURF_ACTION_READY"; - case (simgrid::surf::Action::State::running): - return "SURF_ACTION_RUNNING"; - case (simgrid::surf::Action::State::failed): - return "SURF_ACTION_FAILED"; - case (simgrid::surf::Action::State::done): - return "SURF_ACTION_DONE"; - case (simgrid::surf::Action::State::not_in_the_system): - return "SURF_ACTION_NOT_IN_THE_SYSTEM"; - default: - return "INVALID STATE"; + case simgrid::surf::Action::State::ready: + return "SURF_ACTION_READY"; + case simgrid::surf::Action::State::running: + return "SURF_ACTION_RUNNING"; + case simgrid::surf::Action::State::failed: + return "SURF_ACTION_FAILED"; + case simgrid::surf::Action::State::done: + return "SURF_ACTION_DONE"; + case simgrid::surf::Action::State::not_in_the_system: + return "SURF_ACTION_NOT_IN_THE_SYSTEM"; + default: + return "INVALID STATE"; } } int main(int argc, char **argv) { - double now = -1.0; surf_init(&argc, argv); /* Initialize some common structures */ xbt_cfg_set_parse("cpu/model:Cas01"); xbt_cfg_set_parse("network/model:CM02"); - xbt_assert(argc >1, "Usage : %s platform.txt\n", argv[0]); + xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]); parse_platform_file(argv[1]); XBT_DEBUG("CPU model: %p", surf_cpu_model_pm); @@ -50,14 +44,13 @@ int main(int argc, char **argv) simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B"); /* Let's do something on it */ - simgrid::surf::Action *actionA = hostA->pimpl_cpu->execution_start(1000.0); - simgrid::surf::Action *actionB = hostB->pimpl_cpu->execution_start(1000.0); - simgrid::surf::Action *actionC = surf_host_sleep(hostB, 7.32); + simgrid::surf::Action* actionA = hostA->pimpl_cpu->execution_start(1000.0); + simgrid::surf::Action* actionB = hostB->pimpl_cpu->execution_start(1000.0); + simgrid::surf::Action* actionC = hostB->pimpl_cpu->sleep(7.32); - /* Use whatever calling style you want... */ - simgrid::surf::Action::State stateActionA = actionA->getState(); /* When you know actionA model type */ - simgrid::surf::Action::State stateActionB = actionB->getState(); /* If you're unsure about it's model type */ - simgrid::surf::Action::State stateActionC = actionC->getState(); /* When you know actionA model type */ + simgrid::surf::Action::State stateActionA = actionA->getState(); + simgrid::surf::Action::State stateActionB = actionB->getState(); + simgrid::surf::Action::State stateActionC = actionC->getState(); /* And just look at the state of these tasks */ XBT_INFO("actionA state: %s", string_action(stateActionA)); @@ -70,49 +63,39 @@ int main(int argc, char **argv) surf_solve(-1.0); do { - simgrid::surf::ActionList *action_list = nullptr; - now = surf_get_clock(); - XBT_INFO("Next Event : %g", now); + XBT_INFO("Next Event : %g", surf_get_clock()); XBT_DEBUG("\t CPU actions"); - action_list = surf_cpu_model_pm->getFailedActionSet(); - for(simgrid::surf::ActionList::iterator it(action_list->begin()), itNext = it, itend(action_list->end()) ; - it != itend ; it=itNext) { - ++itNext; - simgrid::surf::Action *action = static_cast(&*it); - XBT_INFO(" CPU Failed action"); - XBT_DEBUG("\t * Failed : %p", action); - action->unref(); + simgrid::surf::ActionList* action_list = surf_cpu_model_pm->getFailedActionSet(); + while (not action_list->empty()) { + simgrid::surf::Action& action = action_list->front(); + XBT_INFO(" CPU Failed action"); + XBT_DEBUG("\t * Failed : %p", &action); + action.unref(); } action_list = surf_cpu_model_pm->getDoneActionSet(); - for(simgrid::surf::ActionList::iterator it(action_list->begin()), itNext = it, itend(action_list->end()) ; - it != itend ; it=itNext) { - ++itNext; - simgrid::surf::Action *action = static_cast(&*it); + while (not action_list->empty()) { + simgrid::surf::Action& action = action_list->front(); XBT_INFO(" CPU Done action"); - XBT_DEBUG("\t * Done : %p", action); - action->unref(); + XBT_DEBUG("\t * Done : %p", &action); + action.unref(); } action_list = surf_network_model->getFailedActionSet(); - for(simgrid::surf::ActionList::iterator it(action_list->begin()), itNext = it, itend(action_list->end()) ; - it != itend ; it=itNext) { - ++itNext; - simgrid::surf::Action *action = static_cast(&*it); - XBT_INFO(" Network Failed action"); - XBT_DEBUG("\t * Failed : %p", action); - action->unref(); + while (not action_list->empty()) { + simgrid::surf::Action& action = action_list->front(); + XBT_INFO(" Network Failed action"); + XBT_DEBUG("\t * Failed : %p", &action); + action.unref(); } action_list = surf_network_model->getDoneActionSet(); - for(simgrid::surf::ActionList::iterator it(action_list->begin()), itNext = it, itend(action_list->end()) ; - it != itend ; it=itNext) { - ++itNext; - simgrid::surf::Action *action = static_cast(&*it); + while (not action_list->empty()) { + simgrid::surf::Action& action = action_list->front(); XBT_INFO(" Network Done action"); - XBT_DEBUG("\t * Done : %p", action); - action->unref(); + XBT_DEBUG("\t * Done : %p", &action); + action.unref(); } } while ((surf_network_model->getRunningActionSet()->size() || @@ -120,6 +103,5 @@ int main(int argc, char **argv) XBT_DEBUG("Simulation Terminated"); - surf_exit(); return 0; }