tuto-msg: fix compile options, and let sol4.c compile

diff --git a/doc/tuto-msg/Makefile b/doc/tuto-msg/Makefile
index cae27ab..18f9df5 100644 (file)
--- a/doc/tuto-msg/Makefile
+++ b/doc/tuto-msg/Makefile
@@ -12,10 +12,10 @@ CC ?= gcc                     # Your compiler (on Mac, use clang instead)
 
 all: masterworker
 
-WARNINGS = -Wshadow -Wcast-align -Waggregate-return -Wmissing-prototypes \
-          -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes \
-          -Wmissing-declarations -Wmissing-noreturn -Wredundant-decls \
-         -Wnested-externs -Wpointer-arith -Wwrite-strings
+WARNINGS = -Wall -Wextra -Wshadow -Wcast-align -Waggregate-return -Wmissing-prototypes \
+          -Wmissing-declarations -Wmissing-prototypes -Wpointer-arith -Wwrite-strings \
+          -Wmissing-noreturn -Wredundant-decls \
+         -Wno-nested-externs  -Wno-strict-prototypes -Wno-unused-parameter
 WARNINGS += -Werror # Comment that line to not be in paranoid mode
 
 # CFLAGS = -std=gnu99 -g -O0 $(WARNINGS) $(EXTRA_CFLAGS) # Use this line to make debugging easier

diff --git a/doc/tuto-msg/masterworker-sol4.c b/doc/tuto-msg/masterworker-sol4.c
index a322cbb..4aaade0 100644 (file)
--- a/doc/tuto-msg/masterworker-sol4.c
+++ b/doc/tuto-msg/masterworker-sol4.c
@@ -49,8 +49,7 @@ static int master(int argc, char* argv[])
   XBT_INFO("Got %d workers and will send tasks for %g seconds", workers_count, timeout);
 
   /* Dispatch the tasks */
-  xbt_dynar_t idle_hosts = xbt_dynar_new(sizeof(msg_host_t), NULL);
-  int task_num           = 0;
+  int task_num = 0;
   while (MSG_get_clock() < timeout) {
 
     /* Retrieve the next incomming request */
@@ -77,7 +76,7 @@ static int master(int argc, char* argv[])
   }
 
   XBT_DEBUG("Time is up. Let's tell everybody the computation is over.");
-  for (int i = 0; i < workers_count; i++) { /* We don't write in order, but the total amount is right
+  for (int i = 0; i < workers_count; i++) { /* We don't write in order, but the total amount is right */
 
     /* Don't write to a worker that did not request for work, or it will deadlock: both would be sending something */
     msg_task_t request = NULL;