some extra cleanups in simdag examples

[simgrid.git] / examples / simdag / properties / sd_prop.c

diff --git a/examples/simdag/properties/sd_prop.c b/examples/simdag/properties/sd_prop.c
index a015ef9..040e55b 100644 (file)
--- a/examples/simdag/properties/sd_prop.c
+++ b/examples/simdag/properties/sd_prop.c
@@ -1,26 +1,15 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
+/* Copyright (c) 2007-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 <stdlib.h>
 #include "simgrid/simdag.h"
-#include "xbt/ex.h"
-#include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/dict.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test");
 
 int main(int argc, char **argv)
 {
-  SD_workstation_t w1;
-  SD_workstation_t w2;
-  const char *name1;
-  const char *name2;
-  xbt_dict_t props;
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;
   char noexist[] = "NoProp";
@@ -29,46 +18,37 @@ int main(int argc, char **argv)
 
   /* SD initialization */
   SD_init(&argc, argv);
-  xbt_assert(argc > 1,
-            "Usage: %s platform_file\n\tExample: %s ../two_hosts.xml", 
-            argv[0], argv[0]);
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s ../../platforms/prop.xml", argv[0], argv[0]);
 
   SD_create_environment(argv[1]);
 
   /* init of platform elements */
-  w1 = SD_workstation_get_by_name("host1");
-  w2 = SD_workstation_get_by_name("host2");
-  name1 = SD_workstation_get_name(w1);
-  name2 = SD_workstation_get_name(w2);
-
-
-  /* The host properties can be retrived from all interfaces */
-
-  XBT_INFO("Property list for workstation %s", name1);
-  /* Get the property list of the workstation 1 */
-  props = SD_workstation_get_properties(w1);
+  sg_host_t h1 = sg_host_by_name("host1");
+  sg_host_t h2 = sg_host_by_name("host2");
+  const char *name1 = sg_host_get_name(h1);
+  const char *name2 = sg_host_get_name(h2);
 
+  /* Get the property list of 'host1' */
+  XBT_INFO("Property list for host %s", name1);
+  xbt_dict_t props = sg_host_get_properties(h1);
 
   /* Trying to set a new property */
   xbt_dict_set(props, "NewProp", strdup("newValue"), xbt_free_f);
 
-  /* Print the properties of the workstation 1 */
+  /* Print the properties of 'host1' */
   xbt_dict_foreach(props, cursor, key, data) {
     XBT_INFO("\tProperty: %s has value: %s", key, data);
   }
 
   /* Try to get a property that does not exist */
-
-  value = SD_workstation_get_property_value(w1, noexist);
+  value = sg_host_get_property_value(h1, noexist);
   XBT_INFO("\tProperty: %s has value: %s", noexist, value?value:"Undefined (NULL)");
 
+  /* Get the property list of 'host2' */
+  XBT_INFO("Property list for host %s", name2);
+  props = sg_host_get_properties(h2);
 
-  XBT_INFO("Property list for workstation %s", name2);
-  /* Get the property list of the workstation 2 */
-  props = SD_workstation_get_properties(w2);
-  cursor = NULL;
-
-  /* Print the properties of the workstation 2 */
+  /* Print the properties of 'host2' */
   xbt_dict_foreach(props, cursor, key, data) {
     XBT_INFO("\tProperty: %s on host: %s", key, data);
   }
@@ -76,7 +56,7 @@ int main(int argc, char **argv)
   /* Modify an existing property test. First check it exists */
   XBT_INFO("Modify an existing property");
 
-  value = SD_workstation_get_property_value(w2, exist);
+  value = sg_host_get_property_value(h2, exist);
   if (value == NULL)
     XBT_INFO("\tProperty: %s is undefined", exist);
   else {
@@ -85,11 +65,11 @@ int main(int argc, char **argv)
   }
 
   /* Test if we have changed the value */
-  value = SD_workstation_get_property_value(w2, exist);
+  value = sg_host_get_property_value(h2, exist);
   XBT_INFO("\tProperty: %s new value: %s", exist, value?value:"Undefined (NULL)");
 
-  /* Test if properties are displayed by SD_workstation_dump */
-  SD_workstation_dump(w2);
+  /* Test if properties are displayed by sg_host_dump */
+  sg_host_dump(h2);
 
   SD_exit();
   return 0;