MASSIVE cleanup: s/workstation/host/

[simgrid.git] / examples / simdag / io / sd_io.c

diff --git a/examples/simdag/io/sd_io.c b/examples/simdag/io/sd_io.c
index c64fe6a..eb33b3c 100644 (file)
--- a/examples/simdag/io/sd_io.c
+++ b/examples/simdag/io/sd_io.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013. The SimGrid Team.
+/* Copyright (c) 2013-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
 
@@ -14,27 +14,29 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(sd_io,
                              "Logging specific to this SimDag example");
 int main(int argc, char **argv)
 {
-  unsigned int ctr, ctr2;
+  unsigned int ctr;
   const SD_workstation_t *workstations;
   int total_nworkstations;
-  xbt_dynar_t current_storage_list;
+  xbt_dict_t current_storage_list;
   char *mount_name;
+  char *storage_name;
+  xbt_dict_cursor_t cursor = NULL;
 
   SD_init(&argc, argv);
   /* Set the workstation model to default, as storage is not supported by the
    * ptask_L07 model yet.
    */
-  SD_config("workstation/model", "default");
+  SD_config("host/model", "default");
   SD_create_environment(argv[1]);
   workstations = SD_workstation_get_list();
   total_nworkstations = SD_workstation_get_number();
 
   for (ctr=0; ctr<total_nworkstations;ctr++){
-    current_storage_list = SD_workstation_get_storage_list(workstations[ctr]);
-    xbt_dynar_foreach(current_storage_list, ctr2, mount_name)
+    current_storage_list = SD_workstation_get_mounted_storage_list(workstations[ctr]);
+    xbt_dict_foreach(current_storage_list,cursor,mount_name,storage_name)
       XBT_INFO("Workstation '%s' mounts '%s'",
          SD_workstation_get_name(workstations[ctr]), mount_name);
-    xbt_dynar_free_container(&current_storage_list);
+    xbt_dict_free(&current_storage_list);
   }
   SD_exit();
   return 0;