From: Martin Quinson Date: Mon, 28 Nov 2016 22:36:27 +0000 (+0100) Subject: cosmetics (and stop using routing_platf) X-Git-Tag: v3_14~136 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/65a51e93f1cd7c79ba5f90d7417c4b48f1a6a5d8?hp=a3f2c3c47a2cdae9e34c468a0b548f085b92a188 cosmetics (and stop using routing_platf) --- diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index 6035034bfd..d88fef02d4 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -149,14 +149,14 @@ int main(int argc, char **argv) sg_host_t host1, host2; for (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host host1 = hosts[it_src]; - value1 = sg_host_by_name(host1->name().c_str())->pimpl_netcard; + value1 = host1->pimpl_netcard; for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host host2 = hosts[it_dst]; std::vector *route = new std::vector(); value2 = host2->pimpl_netcard; - routing_platf->getRouteAndLatency(value1, value2, route,nullptr); + simgrid::kernel::routing::AsImpl::getGlobalRoute(value1, value2, route, nullptr); if (! route->empty()){ - std::printf(" \n ", host1->name().c_str(), host2->name().c_str()); + std::printf(" \n ", host1->cname(), host2->cname()); for (auto link: *route) std::printf("",link->getName()); std::printf("\n \n"); @@ -166,9 +166,9 @@ int main(int argc, char **argv) xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2){ //to router value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL); if(value2->isRouter()){ - std::printf(" \n ", host1->name().c_str(), dst); + std::printf(" \n ", host1->cname(), dst); std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,nullptr); + simgrid::kernel::routing::AsImpl::getGlobalRoute(value1, value2, route, nullptr); for (auto link : *route) std::printf("",link->getName()); delete route; @@ -185,7 +185,7 @@ int main(int argc, char **argv) if(value2->isRouter()){ std::printf(" \n ", src, dst); std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,nullptr); + simgrid::kernel::routing::AsImpl::getGlobalRoute(value1, value2, route, nullptr); for(auto link :*route) std::printf("",link->getName()); delete route; @@ -194,10 +194,10 @@ int main(int argc, char **argv) } for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host host2 = hosts[it_dst]; - std::printf(" \n ",src, host2->name().c_str()); + std::printf(" \n ", src, host2->cname()); std::vector *route = new std::vector(); value2 = host2->pimpl_netcard; - routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route, nullptr); + simgrid::kernel::routing::AsImpl::getGlobalRoute(value1, value2, route, nullptr); for(auto link : *route) std::printf("",link->getName()); delete route; diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp index da0716fa38..11f4c7ee54 100644 --- a/teshsuite/surf/surf_usage/surf_usage.cpp +++ b/teshsuite/surf/surf_usage/surf_usage.cpp @@ -19,18 +19,18 @@ 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"; } } @@ -41,7 +41,7 @@ int main(int argc, char **argv) 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); @@ -54,10 +54,9 @@ int main(int argc, char **argv) simgrid::surf::Action *actionB = hostB->pimpl_cpu->execution_start(1000.0); simgrid::surf::Action *actionC = surf_host_sleep(hostB, 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)); diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp index 1f7e1574e4..1b9d258869 100644 --- a/teshsuite/surf/surf_usage2/surf_usage2.cpp +++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp @@ -25,7 +25,7 @@ int main(int argc, char **argv) xbt_cfg_set_parse("network/model:CM02"); xbt_cfg_set_parse("cpu/model:Cas01"); - 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]); /*********************** HOST ***********************************/ @@ -48,25 +48,25 @@ int main(int argc, char **argv) XBT_INFO("Next Event : %g", now); for (auto model: *all_existing_models) { - if (surf_model_running_action_set_size((surf_model_t)model)) { + if (surf_model_running_action_set_size(model)) { XBT_DEBUG("\t Running that model"); running = 1; } - action = surf_model_extract_failed_action_set(static_cast(model)); + action = surf_model_extract_failed_action_set(model); while (action != nullptr) { XBT_INFO(" * Done Action"); XBT_DEBUG("\t * Failed Action: %p", action); action->unref(); - action = surf_model_extract_failed_action_set(static_cast(model)); + action = surf_model_extract_failed_action_set(model); } - action = surf_model_extract_done_action_set(static_cast(model)); + action = surf_model_extract_done_action_set(model); while (action != nullptr){ XBT_INFO(" * Done Action"); XBT_DEBUG("\t * Done Action: %p", action); action->unref(); - action = surf_model_extract_done_action_set(static_cast(model)); + action = surf_model_extract_done_action_set(model); } } } while (running && surf_solve(-1.0) >= 0.0);