sed -i -e 's/\t/ /g' [sources] Please people, stop using tabs

[simgrid.git] / doc / msg-tuto-src / masterworker4.c

diff --git a/doc/msg-tuto-src/masterworker4.c b/doc/msg-tuto-src/masterworker4.c
index 35755cc..029ceb9 100644 (file)
--- a/doc/msg-tuto-src/masterworker4.c
+++ b/doc/msg-tuto-src/masterworker4.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2007-2010, 2013. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013-2015. 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 "simgrid/msg.h"            /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
 #include "xbt/sysdep.h"         /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
@@ -46,30 +46,30 @@ int master(int argc, char *argv[])
 
   TRACE_category(master_name);
 
-  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &timeout);
+  XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%lg", &timeout);
   xbt_assert(res,"Invalid argument %s\n", argv[1]);
   res = sscanf(argv[2], "%lg", &task_comp_size);
   xbt_assert(res, "Invalid argument %s\n", argv[2]);
   res = sscanf(argv[3], "%lg", &task_comm_size);
   xbt_assert(res, "Invalid argument %s\n", argv[3]);
 
-  {                             /* Process organisation */
+  {                             /* Process organization */
     workers_count = MSG_get_host_number();
     workers = xbt_dynar_to_array(MSG_hosts_as_dynar());
     
     for (i = 0; i < workers_count; i++)
       if(host_self == workers[i]) {
-       workers[i] = workers[workers_count-1];
-       workers_count--;
-       break;
+  workers[i] = workers[workers_count-1];
+  workers_count--;
+  break;
       }
 
     for (i = 0; i < workers_count; i++)
-       MSG_process_create("worker", worker, master_name, workers[i]);
+  MSG_process_create("worker", worker, master_name, workers[i]);
   }
 
   XBT_INFO("Got %d workers and will send tasks for %g seconds!", 
-          workers_count, timeout);
+     workers_count, timeout);
   xbt_dynar_t idle_hosts = xbt_dynar_new(sizeof(msg_host_t), NULL);
   msg_host_t request_host = NULL;
 
@@ -90,8 +90,8 @@ int master(int argc, char *argv[])
     if(MSG_get_clock()>timeout) {
       if(xbt_dynar_length(idle_hosts) == workers_count) break;
       else {
-       MSG_process_sleep(.1);
-       continue;
+  MSG_process_sleep(.1);
+  continue;
       }
     }
     
@@ -103,7 +103,7 @@ int master(int argc, char *argv[])
 
     sprintf(sprintf_buffer, "Task_%d", i);
     task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
-                          NULL);
+         NULL);
     MSG_task_set_category(task, master_name);
 
     xbt_dynar_shift(idle_hosts, &request_host);
@@ -123,7 +123,7 @@ int master(int argc, char *argv[])
   for (i = 0; i < workers_count; i++) {
     msg_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE);
     MSG_task_send(finalize, build_channel_name(channel,master_name,
-                   MSG_host_get_name(workers[i % workers_count])));
+        MSG_host_get_name(workers[i % workers_count])));
   }
 
   XBT_INFO("Sent %d tasks in total!", task_num);
@@ -136,7 +136,7 @@ int master(int argc, char *argv[])
 int worker(int argc, char *argv[])
 {
   msg_task_t task = NULL;
-  _XBT_GNUC_UNUSED int res;
+  XBT_ATTRIB_UNUSED int res;
   char channel[1024];
 
   const char *my_master = MSG_process_get_data(MSG_process_self());