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<Link*> *route = new std::vector<Link*>();
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(" <route src=\"%s\" dst=\"%s\">\n ", host1->name().c_str(), host2->name().c_str());
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->cname(), host2->cname());
for (auto link: *route)
std::printf("<link_ctn id=\"%s\"/>",link->getName());
std::printf("\n </route>\n");
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(" <route src=\"%s\" dst=\"%s\">\n ", host1->name().c_str(), dst);
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->cname(), dst);
std::vector<Link*> *route = new std::vector<Link*>();
- 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_ctn id=\"%s\"/>",link->getName());
delete route;
if(value2->isRouter()){
std::printf(" <route src=\"%s\" dst=\"%s\">\n ", src, dst);
std::vector<Link*> *route = new std::vector<Link*>();
- 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_ctn id=\"%s\"/>",link->getName());
delete route;
}
for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
host2 = hosts[it_dst];
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ",src, host2->name().c_str());
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", src, host2->cname());
std::vector<Link*> *route = new std::vector<Link*>();
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_ctn id=\"%s\"/>",link->getName());
delete route;
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";
}
}
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);
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));
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 ***********************************/
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<surf_model_t>(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<surf_model_t>(model));
+ action = surf_model_extract_failed_action_set(model);
}
- action = surf_model_extract_done_action_set(static_cast<surf_model_t>(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<surf_model_t>(model));
+ action = surf_model_extract_done_action_set(model);
}
}
} while (running && surf_solve(-1.0) >= 0.0);