-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-2016. 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 <stdio.h>
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
#include "simgrid/simdag.h"
-#include "src/surf/surf_routing.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
+#include "surf/surf_routing.h"
+#include <stdio.h>
int main(int argc, char **argv)
{
- /* SD initialization */
- int size;
- xbt_lib_cursor_t cursor = nullptr;
- char *key, *data;
-
SD_init(&argc, argv);
-
- /* creation of the environment */
SD_create_environment(argv[1]);
- size = xbt_dict_length(host_list) + xbt_lib_length(as_router_lib);
-
- printf("Host number: %zu, link number: %d, elmts number: %d\n", sg_host_count(), sg_link_count(), size);
-
- xbt_dict_foreach(host_list, cursor, key, data) {
- simgrid::surf::NetCard * nc = sg_netcard_by_name_or_null(key);
- printf(" - Seen: \"%s\". Type: %s\n", key, nc->isRouter() ? "router" : (nc->isAS()?"AS":"host"));
+ 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::instance()->netpointList(&netcardList);
+ std::sort(netcardList.begin(), netcardList.end(),
+ [](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::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);
- xbt_lib_foreach(as_router_lib, cursor, key, data) {
- simgrid::surf::NetCard * nc = sg_netcard_by_name_or_null(key);
- printf(" - Seen: \"%s\". Type: %s\n", key, nc->isRouter() ? "router" : (nc->isAS()?"AS":"host"));
- }
+ std::printf("NetCards count: %zu\n", netcardList.size());
+ for (auto nc : netcardList)
+ std::printf(" - Seen: \"%s\". Type: %s\n", nc->cname(),
+ nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : (nc->isHost() ? "host" : "buggy")));
SD_exit();
return 0;