revise documentation of tracing examples

[simgrid.git] / examples / msg / energy-ptask / energy-ptask.c

diff --git a/examples/msg/energy-ptask/energy-ptask.c b/examples/msg/energy-ptask/energy-ptask.c
index 46990fa..522ed98 100644 (file)
--- a/examples/msg/energy-ptask/energy-ptask.c
+++ b/examples/msg/energy-ptask/energy-ptask.c
@@ -20,49 +20,47 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example")
 static int runner(int argc, char *argv[])
 {
   /* Retrieve the list of all hosts as an array of hosts */
-  xbt_dynar_t slaves_dynar = MSG_hosts_as_dynar();
-  int slaves_count = xbt_dynar_length(slaves_dynar);
-  msg_host_t *slaves = xbt_dynar_to_array(slaves_dynar);
+  int hosts_count = MSG_get_host_number();
+  msg_host_t *hosts = xbt_dynar_to_array(MSG_hosts_as_dynar());
 
   XBT_INFO("First, build a classical parallel task, with 1 Gflop to execute on each node, "
            "and 10MB to exchange between each pair");
-  double *computation_amounts = xbt_new0(double, slaves_count);
-  double *communication_amounts = xbt_new0(double, slaves_count * slaves_count);
+  double *computation_amounts = xbt_new0(double, hosts_count);
+  double *communication_amounts = xbt_new0(double, hosts_count * hosts_count);
 
-  for (int i = 0; i < slaves_count; i++)
+  for (int i = 0; i < hosts_count; i++)
     computation_amounts[i] = 1e9; // 1 Gflop
 
-  for (int i = 0; i < slaves_count; i++)
-    for (int j = i + 1; j < slaves_count; j++)
-      communication_amounts[i * slaves_count + j] = 1e7; // 10 MB
+  for (int i = 0; i < hosts_count; i++)
+    for (int j = i + 1; j < hosts_count; j++)
+      communication_amounts[i * hosts_count + j] = 1e7; // 10 MB
 
   msg_task_t ptask =
-    MSG_parallel_task_create("parallel task", slaves_count, slaves, computation_amounts, communication_amounts, NULL);
+    MSG_parallel_task_create("parallel task", hosts_count, hosts, computation_amounts, communication_amounts, NULL);
   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
   /* The arrays communication_amounts and computation_amounts are not to be freed manually */
 
   XBT_INFO("Then, build a parallel task involving only computations and no communication (1 Gflop per node)");
-  computation_amounts = xbt_new0(double, slaves_count);
-  for (int i = 0; i < slaves_count; i++)
+  computation_amounts = xbt_new0(double, hosts_count);
+  for (int i = 0; i < hosts_count; i++)
     computation_amounts[i] = 1e9; // 1 Gflop
-  ptask =
-    MSG_parallel_task_create("parallel exec", slaves_count, slaves, computation_amounts, NULL/* no comm */, NULL);
+  ptask = MSG_parallel_task_create("parallel exec", hosts_count, hosts, computation_amounts, NULL/* no comm */, NULL);
   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
 
-  XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", MSG_host_get_name(slaves[1]));
+  XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", MSG_host_get_name(hosts[1]));
   computation_amounts = xbt_new0(double, 1);
   computation_amounts[0] = 1e9; // 1 Gflop
   msg_host_t *remote = xbt_new(msg_host_t,1);
-  remote[0] = slaves[1];
+  remote[0] = hosts[1];
   ptask = MSG_parallel_task_create("remote exec", 1, remote, computation_amounts, NULL/* no comm */, NULL);
   MSG_parallel_task_execute(ptask);
   MSG_task_destroy(ptask);
   free(remote);
 
   XBT_INFO("Goodbye now!");
-  free(slaves);
+  free(hosts);
   return 0;
 }