-/* Copyright (c) 2008-2012. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <stdio.h>
#include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
-
-extern routing_platf_t routing_platf;
+#include "simgrid/simdag.h"
+#include "surf/surf.h"
int main(int argc, char **argv)
{
- /* initialisation of SD */
+ /* SD initialization */
int size;
- SD_init(&argc, argv);
xbt_lib_cursor_t cursor = NULL;
char *key, *data;
+ SD_init(&argc, argv);
+
/* creation of the environment */
SD_create_environment(argv[1]);
- size = xbt_lib_length(host_lib) + xbt_lib_length(as_router_lib);
+ size = xbt_dict_length(host_list) + xbt_lib_length(as_router_lib);
- printf("Workstation number: %d, link number: %d, elmts number: %d\n",
- SD_workstation_get_number(), SD_link_get_number(), size);
+ printf("Workstation number: %zu, link number: %d, elmts number: %d\n", sg_host_count(), sg_link_count(), size);
- xbt_lib_foreach(host_lib, cursor, key, data) {
- printf(" - Seen: \"%s\" is type : %d\n", key,
- (int) routing_get_network_element_type(key));
- }
+ xbt_dict_foreach(host_list, cursor, key, data)
+ printf(" - Seen: \"%s\" is type : %d\n", key, (int) routing_get_network_element_type(key));
- xbt_lib_foreach(as_router_lib, cursor, key, data) {
- printf(" - Seen: \"%s\" is type : %d\n", key,
- (int) routing_get_network_element_type(key));
- }
+ xbt_lib_foreach(as_router_lib, cursor, key, data)
+ printf(" - Seen: \"%s\" is type : %d\n", key, (int) routing_get_network_element_type(key));
SD_exit();
return 0;