X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/06bae8eb4bc956a5ee70ec1d3cdbc5e7e782536f..51cc3af6855ddc45c4c99605f99d68443ea4870a:/examples/msg/properties/msg_prop.c

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index 5b36d02b2b..242a8faa7b 100644
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -14,34 +14,47 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+/** @addtogroup MSG_examples
+ * 
+ * - <b>properties/msg_prop.c</b> Attaching arbitrary informations to
+ *   host, processes and such, and retrieving them with @ref
+ *   MSG_host_get_properties, @ref MSG_host_get_property_value, @ref
+ *   MSG_process_get_properties and @ref
+ *   MSG_process_get_property_value. Also make sure to read the
+ *   platform and deployment XML files to see how to declare these
+ *   data.
+ * 
+ */
+
 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,
+msg_error_t test_all(const char *platform_file,
                      const char *application_file);
 
-int alice(int argc, char *argv[])
+static void test_host(const char*hostname) 
 {
-  m_host_t host1 = MSG_get_host_by_name("host1");
-  xbt_dict_t props = MSG_host_get_properties(host1);
+  msg_host_t thehost = MSG_get_host_by_name(hostname);
+  xbt_dict_t props = MSG_host_get_properties(thehost);
   xbt_dict_cursor_t cursor = NULL;
   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)
       XBT_INFO("  Host property: '%s' -> '%s'", key, data);
 
   XBT_INFO("== Try to get a host property that does not exist");
-  value = MSG_host_get_property_value(host1, noexist);
+  value = MSG_host_get_property_value(thehost, noexist);
   xbt_assert(!value, "The key exists (it's not supposed to)");
 
   XBT_INFO("== Try to get a host property that does exist");
-  value = MSG_host_get_property_value(host1, exist);
+  value = MSG_host_get_property_value(thehost, exist);
   xbt_assert(value, "\tProperty %s is undefined (where it should)",
               exist);
   xbt_assert(!strcmp(value, "180"),
@@ -50,16 +63,27 @@ int alice(int argc, char *argv[])
   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(host1, exist);
+  value = MSG_host_get_property_value(thehost, exist);
   xbt_assert(value, "Property %s is undefined (where it should)", exist);
   xbt_assert(!strcmp(value, "250"),
               "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 */
+  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 */
+  test_host("host1");
+  return 0;
+}
+int carole(int argc, char *argv[]) {/* Dump what we have on a remote host */
+  MSG_process_sleep(1); // Wait for alice to be done with its experiment
+  test_host("host1");
   return 0;
 }
 
@@ -85,13 +109,29 @@ int bob(int argc, char *argv[])
 }
 
 /** Test function */
-MSG_error_t test_all(const char *platform_file,
+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();
@@ -101,16 +141,15 @@ MSG_error_t test_all(const char *platform_file,
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
     exit(1);
   }
   res = test_all(argv[1], argv[2]);
-  MSG_clean();
 
   if (res == MSG_OK)
     return 0;