X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c714798d5c146946f9ccce06da87bc1707b2de2d..88425d917174073213cea8943fa31eb0049cb84d:/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 c45849b9a2..e70aa46e8a 100644
--- a/examples/msg/parallel_task/parallel_task.c
+++ b/examples/msg/parallel_task/parallel_task.c
@@ -14,26 +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_dynar = MSG_hosts_as_dynar();
   slaves_count = xbt_dynar_length(slaves_dynar);
   slaves = xbt_dynar_to_array(slaves_dynar);
-  xbt_dynar_free(&slaves_dynar);
 
   computation_amount = xbt_new0(double, slaves_count);
   communication_amount = xbt_new0(double, slaves_count * slaves_count);
@@ -62,17 +71,17 @@ int test(int argc, char *argv[])
 }
 
 /** 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;
-  m_host_t first_host;
+  msg_host_t first_host;
 
   MSG_config("workstation/model", "ptask_L07");
   MSG_create_environment(platform_file);
 
   all_hosts = MSG_hosts_as_dynar();
-  first_host = xbt_dynar_pop_as(all_hosts,m_host_t);
+  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);
@@ -83,16 +92,15 @@ MSG_error_t test_all(const char *platform_file)
 
 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;