Kill SD_link_get_properties: hard to maintain and makes very little sense (Shout...

[simgrid.git] / examples / simdag / metaxml / sd_meta.c

diff --git a/examples/simdag/metaxml/sd_meta.c b/examples/simdag/metaxml/sd_meta.c
index 79d7532..d2a54f2 100644 (file)
--- a/examples/simdag/metaxml/sd_meta.c
+++ b/examples/simdag/metaxml/sd_meta.c
@@ -11,9 +11,19 @@
 #include "xbt/time.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test,
-                            "Logging specific to this SimDag example");
+                             "Logging specific to this SimDag example");
+
+int main(int argc, char **argv)
+{
+
+  const char *platform_file;
+  const SD_workstation_t *workstations;
+  int ws_nr;
+  SD_workstation_t w1 = NULL;
+  SD_workstation_t w2 = NULL;
+  const char *name1, *name2;
+  int i, j, k;
 
-int main(int argc, char **argv) {
   /* initialisation of SD */
   SD_init(&argc, argv);
 
@@ -26,30 +36,32 @@ int main(int argc, char **argv) {
   }
 
   /* creation of the environment */
-  const char * platform_file = argv[1];
+  platform_file = argv[1];
   SD_create_environment(platform_file);
 
   /* test the estimation functions */
-  const SD_workstation_t *workstations = SD_workstation_get_list();
-  int ws_nr = SD_workstation_get_number();
+  workstations = SD_workstation_get_list();
+  ws_nr = SD_workstation_get_number();
+
 
-  SD_workstation_t w1 = NULL;
-  SD_workstation_t w2 = NULL;
-  const char *name1, *name2;
   /* Show routes between all workstation */
-  int i,j,k;
-  for (i=0; i<ws_nr; i++){
-    for (j=0;j<ws_nr; j++){
+
+  for (i = 0; i < ws_nr; i++) {
+    for (j = 0; j < ws_nr; j++) {
+      const SD_link_t *route;
+      int route_size;
       w1 = workstations[i];
       w2 = workstations[j];
       name1 = SD_workstation_get_name(w1);
       name2 = SD_workstation_get_name(w2);
-      INFO2("Route between %s and %s:", name1, name2);   
-      const SD_link_t *route = SD_route_get_list(w1, w2);
-      int route_size = SD_route_get_size(w1, w2);
+      INFO2("Route between %s and %s:", name1, name2);
+      route = SD_route_get_list(w1, w2);
+      route_size = SD_route_get_size(w1, w2);
       for (k = 0; k < route_size; k++) {
-        INFO3("\tLink %s: latency = %f, bandwidth = %f", SD_link_get_name(route[k]),
-         SD_link_get_current_latency(route[k]), SD_link_get_current_bandwidth(route[k]));
+        INFO3("\tLink %s: latency = %f, bandwidth = %f",
+              SD_link_get_name(route[k]),
+              SD_link_get_current_latency(route[k]),
+              SD_link_get_current_bandwidth(route[k]));
       }
     }
   }
@@ -57,4 +69,3 @@ int main(int argc, char **argv) {
   SD_exit();
   return 0;
 }
-