X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bf6e499b29ed3183f40b60fbcd0fe3caed12f197..048b8c7e8cec5ab24e17e087b5cf2a7571b97a1e:/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 c16de7212f..5b25179bef 100644
--- a/examples/msg/parallel_task/parallel_task.c
+++ b/examples/msg/parallel_task/parallel_task.c
@@ -1,92 +1,108 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007-2012. 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. */
 
 #include <stdio.h>
-#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h" /* calloc, printf */
+#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "xbt/sysdep.h"         /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
 #include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
+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;
-  double task_comp_size = 0;
-  double task_comm_size = 0;
+  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;
-  int i,j;
+  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);
 
-  slaves_count = MSG_get_host_number();
-  slaves = MSG_get_host_table();
+  computation_amount = xbt_new0(double, slaves_count);
+  communication_amount = xbt_new0(double, slaves_count * slaves_count);
 
-  computation_amount = calloc(slaves_count,sizeof(double));
-  communication_amount = calloc(slaves_count*slaves_count,sizeof(double));
-  
-  for(i=0;i<slaves_count;i++) 
-    computation_amount[i]=task_comp_size;
+  for (i = 0; i < slaves_count; i++)
+    computation_amount[i] = task_comp_size;
 
-  for(i=0;i<slaves_count;i++) 
-    for(j=i+1;j<slaves_count;j++) 
-      communication_amount[i*slaves_count+j]=task_comm_size;
+  for (i = 0; i < slaves_count; i++)
+    for (j = i + 1; j < slaves_count; j++)
+      communication_amount[i * slaves_count + j] = task_comm_size;
 
   ptask = MSG_parallel_task_create("parallel task",
-				   slaves_count, slaves,
-				   computation_amount,
-				   communication_amount,
-				   NULL);
+                                   slaves_count, slaves,
+                                   computation_amount,
+                                   communication_amount, NULL);
   MSG_parallel_task_execute(ptask);
 
-  
-  INFO0("Goodbye now!");
-  free(communication_amount);
-  free(computation_amount);
+  MSG_task_destroy(ptask);
+  /* There is no need to free that! */
+/*   free(communication_amount); */
+/*   free(computation_amount); */
+
+  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","KCCFLN05"); */
-  MSG_set_channel_number(1);
+  MSG_config("workstation/model", "ptask_L07");
   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();
-  
-  INFO1("Simulation time %g",MSG_get_clock());
+  xbt_dynar_free(&all_hosts);
+
+  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);
+    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)
+  if (res == MSG_OK)
     return 0;
   else
     return 1;