X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a34aa584ccd2bdb81659d0e5df22864cf999c0f4..51cc3af6855ddc45c4c99605f99d68443ea4870a:/examples/msg/properties/msg_prop.c diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c index 7c05736efc..242a8faa7b 100644 --- a/examples/msg/properties/msg_prop.c +++ b/examples/msg/properties/msg_prop.c @@ -43,7 +43,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) @@ -63,7 +63,7 @@ static void test_host(const char*hostname) XBT_INFO(" Property: %s old value: %s", exist, value); XBT_INFO("== Trying to modify a host property"); - xbt_dict_set(props, exist, xbt_strdup("250"), NULL); + MSG_host_set_property_value(thehost, exist, xbt_strdup("250"), NULL); /* Test if we have changed the value */ value = MSG_host_get_property_value(thehost, exist); @@ -74,7 +74,7 @@ static void test_host(const char*hostname) 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 */ @@ -112,11 +112,26 @@ int bob(int argc, char *argv[]) msg_error_t test_all(const char *platform_file, const char *application_file) { + int host_number; + unsigned int i; + xbt_dynar_t hosts; + msg_host_t host; MSG_function_register("alice", alice); MSG_function_register("bob", bob); MSG_function_register("carole", carole); MSG_create_environment(platform_file); + + host_number = MSG_get_host_number(); + XBT_INFO("There are %d hosts in the environment", host_number); + + hosts = MSG_hosts_as_dynar(); + + xbt_dynar_foreach(hosts, i, host){ + XBT_INFO("Host '%s' runs at %.0f flops/s",MSG_host_get_name(host), + MSG_get_host_speed(host)); + } + MSG_launch_application(application_file); return MSG_main(); @@ -135,7 +150,6 @@ int main(int argc, char *argv[]) exit(1); } res = test_all(argv[1], argv[2]); - MSG_clean(); if (res == MSG_OK) return 0;