-/* Copyright (c) 2008-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-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 "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "simgrid/simdag.h"
-#include "src/kernel/routing/NetCard.hpp"
-#include "surf/surf_routing.h"
+#include "src/kernel/routing/NetPoint.hpp"
#include <stdio.h>
int main(int argc, char **argv)
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::NetCard*> netcardList;
- simgrid::s4u::Engine::instance()->netcardList(&netcardList);
+ std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
+ simgrid::s4u::Engine::instance()->netpointList(&netcardList);
std::sort(netcardList.begin(), netcardList.end(),
- [](simgrid::kernel::routing::NetCard* a, simgrid::kernel::routing::NetCard* b) {
- return a->name() < b->name();
- });
+ [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) {
+ return a->name() < b->name();
+ });
int it;
sg_host_t host;
xbt_dynar_foreach(hosts, it, host) {
- simgrid::kernel::routing::NetCard * nc = host->pimpl_netcard;
- std::printf(" - Seen: \"%s\". Type: %s\n", host->cname(),
- nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : (nc->isHost() ? "host" : "buggy")));
+ simgrid::kernel::routing::NetPoint* nc = host->pimpl_netpoint;
+ const char *type = "buggy";
+ if (nc->isRouter())
+ type = "router";
+ if (nc->isNetZone())
+ type = "netzone";
+ if (nc->isHost())
+ type = "host";
+ std::printf(" - Seen: \"%s\". Type: %s\n", host->cname(), type);
}
xbt_dynar_free(&hosts);