Merge back master branch

[simgrid.git] / examples / gras / properties / properties.c

diff --git a/examples/gras/properties/properties.c b/examples/gras/properties/properties.c
index 850b91d..358df12 100644 (file)
--- a/examples/gras/properties/properties.c
+++ b/examples/gras/properties/properties.c
@@ -26,29 +26,29 @@ int alice(int argc, char *argv[])
   /* Let the other process change the host props */
   gras_os_sleep(1);
 
-  INFO0("== Dump all the properties of current host");
+  XBT_INFO("== Dump all the properties of current host");
   xbt_dict_foreach(host_props, cursor, key, data)
-    INFO2("  Host property: '%s' has value: '%s'", key, data);
+      XBT_INFO("  Host property: '%s' has value: '%s'", key, data);
 
-  INFO0("== Dump all the properties of alice");
+  XBT_INFO("== Dump all the properties of alice");
   xbt_dict_foreach(process_props, cursor, key, data)
-    if (!strncmp(key, "SG_TEST_", 8))
-    INFO2("  Process property: '%s' has value: '%s'", key, data);
+      if (!strncmp(key, "SG_TEST_", 8))
+    XBT_INFO("  Process property: '%s' has value: '%s'", key, data);
 
-  INFO0("== Try to get a process property that does not exist");
+  XBT_INFO("== Try to get a process property that does not exist");
   value = gras_process_property_value("Nonexisting");
-  xbt_assert0(!value, "nonexisting property exists!!");
+  xbt_assert(!value, "nonexisting property exists!!");
 
   /* Modify an existing property. First check it exists */
-  INFO0("== Trying to modify a process property");
+  XBT_INFO("== Trying to modify a process property");
   value = gras_process_property_value("new prop");
-  xbt_assert0(!value, "Property 'new prop' exists before I add it!");
+  xbt_assert(!value, "Property 'new prop' exists before I add it!");
   xbt_dict_set(process_props, "new prop", xbt_strdup("new value"),
                xbt_free_f);
 
   /* Test if we have changed the value */
   value = gras_process_property_value("new prop");
-  xbt_assert1(!strcmp(value, "new value"),
+  xbt_assert(!strcmp(value, "new value"),
               "New property does have the value I've set ('%s' != 'new value')",
               value);
 
@@ -66,22 +66,23 @@ int bob(int argc, char *argv[])
   char *key, *data;
   const char *value;
 
-  INFO0("== Dump all the properties of host1");
+  XBT_INFO("== Dump all the properties of host1");
   xbt_dict_foreach(host_props, cursor, key, data)
-    INFO2("  Host property: '%s' has value: '%s'", key, data);
+      XBT_INFO("  Host property: '%s' has value: '%s'", key, data);
 
-  INFO0("== Try to get a property that does not exist");
+  XBT_INFO("== Try to get a property that does not exist");
   value = gras_os_host_property_value("non existing key");
-  xbt_assert1(value == NULL,
-              "The key 'non existing key' exists (with value '%s')!!", value);
+  xbt_assert(value == NULL,
+              "The key 'non existing key' exists (with value '%s')!!",
+              value);
 
-  INFO0
-    ("== Set a host property that alice will try to retrieve in SG (from bob->hello)");
+  XBT_INFO
+      ("== Set a host property that alice will try to retrieve in SG (from bob->hello)");
   xbt_dict_set(host_props, "from bob", xbt_strdup("hello"), xbt_free_f);
 
-  INFO0("== Dump all the properties of host1 again to check the addition");
+  XBT_INFO("== Dump all the properties of host1 again to check the addition");
   xbt_dict_foreach(host_props, cursor, key, data)
-    INFO2("  Host property: '%s' has value: '%s'", key, data);
+      XBT_INFO("  Host property: '%s' has value: '%s'", key, data);
 
   gras_os_sleep(1);             /* KILLME once bug on empty main is solved */
   gras_exit();