X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f54e5c450791e19b01f31e86c93e5a603fd0c4b..5b3677b425b9cc6949c1573d59ac772540cbf4b2:/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 8f13bd362f..a3dda645e1 100644
--- a/examples/msg/parallel_task/parallel_task.c
+++ b/examples/msg/parallel_task/parallel_task.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -15,23 +14,35 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+/** @addtogroup MSG_examples
+ * 
+ * - <b>parallel_task/parallel_task.c</b>: Demonstrates the use of
+ *   @ref MSG_parallel_task_create, to create special tasks that run
+ *   on several hosts at the same time. The resulting simulations are
+ *   very close to what can be achieved in @ref SD_API, but still
+ *   allows to use the other features of MSG (it'd be cool to be able
+ *   to mix interfaces, but it's not possible ATM).
+ */
+
 int test(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file);
+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;
+  msg_host_t *slaves = NULL;
   double task_comp_size = 100000;
   double task_comm_size = 10000;
   double *computation_amount = NULL;
   double *communication_amount = NULL;
-  m_task_t ptask = NULL;
+  msg_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);
@@ -49,43 +60,47 @@ int test(int argc, char *argv[])
                                    communication_amount, NULL);
   MSG_parallel_task_execute(ptask);
 
+  MSG_task_destroy(ptask);
   /* There is no need to free that! */
 /*   free(communication_amount); */
 /*   free(computation_amount); */
 
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
   free(slaves);
   return 0;
 }
 
 /** Test function */
-MSG_error_t test_all(const char *platform_file)
+msg_error_t test_all(const char *platform_file)
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
+  xbt_dynar_t all_hosts;
+  msg_host_t first_host;
 
   MSG_config("workstation/model", "ptask_L07");
-  MSG_set_channel_number(1);
   MSG_create_environment(platform_file);
 
-  MSG_process_create("test", test, NULL, MSG_get_host_table()[0]);
+  all_hosts = MSG_hosts_as_dynar();
+  first_host = xbt_dynar_getfirst_as(all_hosts,msg_host_t);
+  MSG_process_create("test", test, NULL, first_host);
   res = MSG_main();
+  xbt_dynar_free(&all_hosts);
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }
 
 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 < 2) {
     printf("Usage: %s platform_file\n", argv[0]);
     printf("example: %s msg_platform.xml\n", argv[0]);
     exit(1);
   }
   res = test_all(argv[1]);
-  MSG_clean();
 
   if (res == MSG_OK)
     return 0;