-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2020. 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 "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/simdag.h"
-#include "src/kernel/routing/NetPoint.hpp"
+
#include <algorithm>
#include <cstdio>
xbt_dynar_t hosts = sg_hosts_as_dynar();
std::printf("Host count: %zu, link number: %d\n", sg_host_count(), sg_link_count());
- std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
- simgrid::s4u::Engine::getInstance()->getNetpointList(&netcardList);
- std::sort(netcardList.begin(), netcardList.end(),
- [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
- return a->getName() < b->getName();
+ std::vector<simgrid::kernel::routing::NetPoint*> netpoints =
+ simgrid::s4u::Engine::get_instance()->get_all_netpoints();
+ std::sort(netpoints.begin(), netpoints.end(),
+ [](const simgrid::kernel::routing::NetPoint* a, const simgrid::kernel::routing::NetPoint* b) {
+ return a->get_name() < b->get_name();
});
int it;
sg_host_t host;
xbt_dynar_foreach(hosts, it, host) {
- simgrid::kernel::routing::NetPoint* nc = host->pimpl_netpoint;
+ const simgrid::kernel::routing::NetPoint* nc = host->get_netpoint();
const char *type = "buggy";
- if (nc->isRouter())
+ if (nc->is_router())
type = "router";
- if (nc->isNetZone())
+ if (nc->is_netzone())
type = "netzone";
- if (nc->isHost())
+ if (nc->is_host())
type = "host";
- std::printf(" - Seen: \"%s\". Type: %s\n", host->getCname(), type);
+ std::printf(" - Seen: \"%s\". Type: %s\n", host->get_cname(), type);
}
xbt_dynar_free(&hosts);
- std::printf("NetCards count: %zu\n", netcardList.size());
- for (auto const& nc : netcardList)
- std::printf(" - Seen: \"%s\". Type: %s\n", nc->getCname(),
- nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : (nc->isHost() ? "host" : "buggy")));
-
+ std::printf("NetCards count: %zu\n", netpoints.size());
+ for (auto const& nc : netpoints) {
+ const char* type;
+ if (nc->is_router())
+ type = "router";
+ else if (nc->is_netzone())
+ type = "netzone";
+ else if (nc->is_host())
+ type = "host";
+ else
+ type = "buggy";
+ std::printf(" - Seen: \"%s\". Type: %s\n", nc->get_cname(), type);
+ }
return 0;
}