Fix compilation with tracing and new network_element_t

[simgrid.git] / examples / msg / parallel_task / parallel_task.c

diff --git a/examples/msg/parallel_task/parallel_task.c b/examples/msg/parallel_task/parallel_task.c
index 3a3825c..11f7251 100644 (file)
--- a/examples/msg/parallel_task/parallel_task.c
+++ b/examples/msg/parallel_task/parallel_task.c
@@ -20,6 +20,7 @@ MSG_error_t test_all(const char *platform_file);
 /** Emitter function  */
 int test(int argc, char *argv[])
 {
+  xbt_dynar_t slaves_dynar;
   int slaves_count = 0;
   m_host_t *slaves = NULL;
   double task_comp_size = 100000;
@@ -29,8 +30,9 @@ int test(int argc, char *argv[])
   m_task_t ptask = NULL;
   int i, j;
 
-  slaves_count = MSG_get_host_number();
-  slaves = MSG_get_host_table();
+  slaves_dynar = MSG_hosts_as_dynar();
+  slaves_count = xbt_dynar_length(slaves_dynar);
+  slaves = xbt_dynar_to_array(slaves_dynar);
 
   computation_amount = xbt_new0(double, slaves_count);
   communication_amount = xbt_new0(double, slaves_count * slaves_count);
@@ -53,7 +55,7 @@ int test(int argc, char *argv[])
 /*   free(communication_amount); */
 /*   free(computation_amount); */
 
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
   free(slaves);
   return 0;
 }
@@ -62,18 +64,19 @@ int test(int argc, char *argv[])
 MSG_error_t test_all(const char *platform_file)
 {
   MSG_error_t res = MSG_OK;
-  m_host_t *hosts;
+  xbt_dynar_t all_hosts;
+  m_host_t first_host;
 
   MSG_config("workstation/model", "ptask_L07");
-  MSG_set_channel_number(1);
   MSG_create_environment(platform_file);
 
-  hosts = MSG_get_host_table();
-  MSG_process_create("test", test, NULL, hosts[0]);
+  all_hosts = MSG_hosts_as_dynar();
+  first_host = xbt_dynar_getfirst_as(all_hosts,m_host_t);
+  MSG_process_create("test", test, NULL, first_host);
   res = MSG_main();
-  xbt_free(hosts);
+  xbt_dynar_free(&all_hosts);
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }