X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85662e22397c029bf1c4271a45aa3eca71e37a15..120a17a595bd3d7636a031ddaa5dc372826dba66:/doc/msg-tuto-src/masterworker2.c

diff --git a/doc/msg-tuto-src/masterworker2.c b/doc/msg-tuto-src/masterworker2.c
index 3a36097ea9..1974889d19 100644
--- a/doc/msg-tuto-src/masterworker2.c
+++ b/doc/msg-tuto-src/masterworker2.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. 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. */
@@ -24,9 +23,6 @@ static int worker(int argc, char* argv[]);
 
 static int master(int argc, char *argv[])
 {
-  int workers_count = 0;
-  msg_host_t *workers = NULL;
-  msg_task_t *todo = NULL;
   msg_host_t host_self = MSG_host_self();
   char *master_name = (char *) MSG_host_get_name(host_self);
   char channel[1024];
@@ -35,36 +31,34 @@ static int master(int argc, char *argv[])
   double comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");  /** - Task compute cost    */
   double comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");  /** - Task communication size */
 
-  {                             /* Process organization */
-    workers_count = MSG_get_host_number();
-    workers = xbt_dynar_to_array(MSG_hosts_as_dynar());
+  /* Get the info about the worker processes (directly from SimGrid) */
+  int workers_count   = argc - 4;
+  msg_host_t* workers = xbt_dynar_to_array(MSG_hosts_as_dynar());
 
-    for (int i = 0; i < workers_count; i++)
-      if (host_self == workers[i]) {
-        workers[i] = workers[workers_count-1];
-        workers_count--;
-        break;
-      }
-
-    for (int i = 0; i < workers_count; i++)
-      MSG_process_create("worker", worker, master_name, workers[i]);
-  }
+  for (int i = 0; i < workers_count; i++) // Remove my host from the list
+    if (host_self == workers[i]) {
+      workers[i] = workers[workers_count - 1];
+      workers_count--;
+      break;
+    }
 
-  XBT_INFO("Got %d workers and will send tasks for %g seconds!", workers_count, timeout);
+  for (int i = 0; i < workers_count; i++)
+    MSG_process_create("worker", worker, (void*)master_name, workers[i]);
+  XBT_INFO("Got %d workers and will send tasks for %g seconds", workers_count, timeout);
 
+  /* Dispatch the tasks */
   int task_num = 0;
   while (1) {
-    char sprintf_buffer[64];
-    msg_task_t task = NULL;
-
-    if(MSG_get_clock()>timeout) break;
+    if (MSG_get_clock() > timeout)
+      break;
 
+    char sprintf_buffer[64];
     sprintf(sprintf_buffer, "Task_%d", task_num);
-    task = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL);
+    msg_task_t task = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL);
 
     build_channel_name(channel, master_name, MSG_host_get_name(workers[task_num % workers_count]));
 
-    XBT_DEBUG("Sending \"%s\" to channel \"%s\"", task->name, channel);
+    XBT_DEBUG("Sending '%s' to channel '%s'", task->name, channel);
     MSG_task_send(task, channel);
     XBT_DEBUG("Sent");
     task_num++;
@@ -80,39 +74,37 @@ static int master(int argc, char *argv[])
 
   XBT_INFO("Sent %d tasks in total!", task_num);
   free(workers);
-  free(todo);
   return 0;
-}                               /* end_of_master */
+}
 
 /** Worker function  */
 static int worker(int argc, char *argv[])
 {
-  msg_task_t task = NULL;
   char channel[1024];
 
   build_channel_name(channel,MSG_process_get_data(MSG_process_self()),  MSG_host_get_name(MSG_host_self()));
 
-  XBT_DEBUG("Receiving on channel \"%s\"", channel);
+  XBT_DEBUG("Receiving on channel '%s'", channel);
 
   while (1) {
+    msg_task_t task = NULL;
     int res = MSG_task_receive(&(task), channel);
     xbt_assert(res == MSG_OK, "MSG_task_receive failed");
-    
-    XBT_DEBUG("Received \"%s\"", MSG_task_get_name(task));
+
+    XBT_DEBUG("Received '%s'", MSG_task_get_name(task));
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
       MSG_task_destroy(task);
       break;
     }
 
-    XBT_DEBUG("Processing \"%s\"", MSG_task_get_name(task));
+    XBT_DEBUG("Processing '%s'", MSG_task_get_name(task));
     MSG_task_execute(task);
-    XBT_DEBUG("\"%s\" done", MSG_task_get_name(task));
+    XBT_DEBUG("'%s' done", MSG_task_get_name(task));
     MSG_task_destroy(task);
-    task = NULL;
   }
   XBT_DEBUG("I'm done. See you!");
   return 0;
-}                               /* end_of_worker */
+}
 
 /** Main function */
 int main(int argc, char *argv[])
@@ -120,16 +112,18 @@ int main(int argc, char *argv[])
   MSG_init(&argc, argv);
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
              "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
-  {                             /*  Simulation setting */
-    MSG_create_environment(argv[1]);
-  }
-  {                             /*   Application deployment */
-    MSG_function_register("master", master);
-    MSG_function_register("worker", worker);
-    MSG_launch_application(argv[2]);
-  }
+
+  /*  Create a simulated platform */
+  MSG_create_environment(argv[1]);
+
+  /*   Application deployment */
+  MSG_function_register("master", master);
+  MSG_function_register("worker", worker);
+  MSG_launch_application(argv[2]);
+
+  /* Run the simulation */
   msg_error_t res = MSG_main();
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
   return (res != MSG_OK);
-}                               /* end_of_main */
+}