Merge branch 'dvfs'

[simgrid.git] / examples / msg / properties / msg_prop.c

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index 17fac55..6cced3c 100644 (file)
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -31,7 +31,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Property test");
 int alice(int argc, char *argv[]);
 int bob(int argc, char *argv[]);
 int carole(int argc, char *argv[]);
-int forwarder(int argc, char *argv[]);
 msg_error_t test_all(const char *platform_file,
                      const char *application_file);
 
@@ -43,7 +42,7 @@ static void test_host(const char*hostname)
   char *key, *data;
   const char *noexist = "Unknown";
   const char *value;
-  char exist[] = "SG_TEST_Hdd";
+  char exist[] = "Hdd";
 
   XBT_INFO("== Print the properties of the host");
   xbt_dict_foreach(props, cursor, key, data)
@@ -72,9 +71,9 @@ static void test_host(const char*hostname)
               "Value of property %s is defined to %s (where it should be 250)",
               exist, value);
   XBT_INFO("   Property: %s old value: %s", exist, value);
-   
+
   /* Restore the value for the next test */
-  xbt_dict_set(props, exist, xbt_strdup("180"), NULL);
+  MSG_host_set_property_value(thehost, exist, xbt_strdup("180"), NULL);
 }
 
 int alice(int argc, char *argv[]) { /* Dump what we have on the current host */
@@ -114,9 +113,10 @@ msg_error_t test_all(const char *platform_file,
 {
   int host_number;
   unsigned int i;
-  double speed;
   xbt_dynar_t hosts;
   msg_host_t host;
+  msg_error_t ret;
+
   MSG_function_register("alice", alice);
   MSG_function_register("bob", bob);
   MSG_function_register("carole", carole);
@@ -135,7 +135,11 @@ msg_error_t test_all(const char *platform_file,
 
   MSG_launch_application(application_file);
 
-  return MSG_main();
+  ret = MSG_main();
+
+  xbt_dynar_free(&hosts);
+
+  return ret;
 }                               /* end_of_test_all */