Bugfix in masterslave_arg

[simgrid.git] / examples / msg / masterslave / masterslave_cluster.c

diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c
index 7676189..1e54f5e 100644 (file)
--- a/examples/msg/masterslave/masterslave_cluster.c
+++ b/examples/msg/masterslave/masterslave_cluster.c
@@ -69,7 +69,7 @@ int master(int argc, char *argv[])
 
   XBT_INFO("Got %d slave(s) :", slaves_count);
   for (i = 0; i < slaves_count; i++)
-    XBT_INFO("\t %s", slaves[i]->name);
+    XBT_INFO("\t %s", MSG_host_get_name(slaves[i]));
 
   XBT_INFO("Got %d task to process :", number_of_tasks);
 
@@ -78,7 +78,7 @@ int master(int argc, char *argv[])
 
   for (i = 0; i < number_of_tasks; i++) {
     XBT_INFO("Sending \"%s\" to \"%s\"",
-          todo[i]->name, slaves[i % slaves_count]->name);
+          todo[i]->name, MSG_host_get_name(slaves[i % slaves_count]));
     if (MSG_host_self() == slaves[i % slaves_count]) {
       XBT_INFO("Hey ! It's me ! :)");
     }
@@ -134,9 +134,12 @@ static int bypass_deployment(void)
        static int surfxml_bufferstack_size = 2048;
        static int surfxml_buffer_stack_stack_ptr = 0;
        static int surfxml_buffer_stack_stack[1024];
+       xbt_dynar_t hosts = MSG_hosts_as_dynar();
        /* allocating memory to the buffer, I think 2MB should be enough */
        surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
-       nb_host = MSG_get_host_number();
+
+       nb_host = xbt_dynar_length(hosts);
+       xbt_dynar_free(&hosts);
 
        /* <platform> */
        SURFXML_BUFFER_SET(platform_version, "3");