X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..61e948b810774df0ab0a52dd60ca1fb16af658c5:/examples/simdag/properties/sd_prop.c

diff --git a/examples/simdag/properties/sd_prop.c b/examples/simdag/properties/sd_prop.c
old mode 100755
new mode 100644
index 089e89c9ab..4af031c2c5
--- a/examples/simdag/properties/sd_prop.c
+++ b/examples/simdag/properties/sd_prop.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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"
 #include "xbt/dynar.h"
@@ -16,9 +16,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test");
 
 int main(int argc, char **argv)
 {
-  const SD_workstation_t *workstations;
-  SD_workstation_t w1;
-  SD_workstation_t w2;
+  sg_host_t w1;
+  sg_host_t w2;
   const char *name1;
   const char *name2;
   xbt_dict_t props;
@@ -26,77 +25,71 @@ int main(int argc, char **argv)
   char *key, *data;
   char noexist[] = "NoProp";
   const char *value;
-  char exist[] = "SG_TEST_Hdd";
+  char exist[] = "Hdd";
 
-  /* initialisation of SD */
+  /* SD initialization */
   SD_init(&argc, argv);
-  if (argc < 2) {
-    INFO1("Usage: %s platform_file", argv[0]);
-    INFO1("example: %s sd_platform.xml", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 1,
+	     "Usage: %s platform_file\n\tExample: %s ../two_hosts.xml", 
+	     argv[0], argv[0]);
+
   SD_create_environment(argv[1]);
 
   /* init of platform elements */
-  workstations = SD_workstation_get_list();
-  w1 = workstations[0];
-  w2 = workstations[1];
-  SD_workstation_set_access_mode(w2, SD_WORKSTATION_SEQUENTIAL_ACCESS);
-  name1 = SD_workstation_get_name(w1);
-  name2 = SD_workstation_get_name(w2);
+  w1 = sg_host_by_name("host1");
+  w2 = sg_host_by_name("host2");
+  name1 = sg_host_get_name(w1);
+  name2 = sg_host_get_name(w2);
 
 
-  /* The host properties can be retrived from all interfaces */
+  /* The host properties can be retrieved from all interfaces */
 
-  INFO1("Property list for workstation %s", name1);
+  XBT_INFO("Property list for workstation %s", name1);
   /* Get the property list of the workstation 1 */
-  props = SD_workstation_get_properties(w1);
+  props = sg_host_get_properties(w1);
 
 
   /* Trying to set a new property */
-  xbt_dict_set(props, xbt_strdup("NewProp"), strdup("newValue"), free);
+  xbt_dict_set(props, "NewProp", strdup("newValue"), xbt_free_f);
 
   /* Print the properties of the workstation 1 */
   xbt_dict_foreach(props, cursor, key, data) {
-    INFO2("\tProperty: %s has value: %s", 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);
-  if (value == NULL)
-    INFO1("\tProperty: %s is undefined", noexist);
-  else
-    INFO2("\tProperty: %s has value: %s", noexist, value);
+  value = sg_host_get_property_value(w1, noexist);
+  XBT_INFO("\tProperty: %s has value: %s", noexist, value?value:"Undefined (NULL)");
 
 
-  INFO1("Property list for workstation %s", name2);
+  XBT_INFO("Property list for workstation %s", name2);
   /* Get the property list of the workstation 2 */
-  props = SD_workstation_get_properties(w2);
+  props = sg_host_get_properties(w2);
   cursor = NULL;
 
   /* Print the properties of the workstation 2 */
   xbt_dict_foreach(props, cursor, key, data) {
-    INFO2("\tProperty: %s on host: %s", key, data);
+    XBT_INFO("\tProperty: %s on host: %s", key, data);
   }
 
   /* Modify an existing property test. First check it exists */
-  INFO0("Modify an existing property");
+  XBT_INFO("Modify an existing property");
 
-  value = SD_workstation_get_property_value(w2, exist);
+  value = sg_host_get_property_value(w2, exist);
   if (value == NULL)
-    INFO1("\tProperty: %s is undefined", exist);
+    XBT_INFO("\tProperty: %s is undefined", exist);
   else {
-    INFO2("\tProperty: %s old value: %s", exist, value);
-    xbt_dict_set(props, exist, strdup("250"), free);
+    XBT_INFO("\tProperty: %s old value: %s", exist, value);
+    xbt_dict_set(props, exist, strdup("250"), xbt_free_f);
   }
 
   /* Test if we have changed the value */
-  value = SD_workstation_get_property_value(w2, exist);
-  if (value == NULL)
-    INFO1("\tProperty: %s is undefined", exist);
-  else
-    INFO2("\tProperty: %s new value: %s", exist, value);
+  value = sg_host_get_property_value(w2, exist);
+  XBT_INFO("\tProperty: %s new value: %s", exist, value?value:"Undefined (NULL)");
+
+  /* Test if properties are displayed by sg_host_dump */
+  sg_host_dump(w2);
 
   SD_exit();
   return 0;