Make these example files compile

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

diff --git a/doc/msg-tuto-src/masterworker1.c b/doc/msg-tuto-src/masterworker1.c
index 4c43065..89ad922 100644 (file)
--- a/doc/msg-tuto-src/masterworker1.c
+++ b/doc/msg-tuto-src/masterworker1.c
@@ -18,7 +18,10 @@ static char * build_channel_name(char *buffer, const char *sender, const char* r
   return buffer;
 }
 
-/** Emitter function  */
+/* forward definitions */
+static int master(int argc, char* argv[]);
+static int worker(int argc, char* argv[]);
+
 static int master(int argc, char *argv[])
 {
   int workers_count = 0;
@@ -28,8 +31,6 @@ static int master(int argc, char *argv[])
   char *master_name = (char *) MSG_host_get_name(host_self);
   char channel[1024];
 
-  int i;
-
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");    /** - Number of tasks      */
   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 */
@@ -39,9 +40,9 @@ static int master(int argc, char *argv[])
 
     todo = xbt_new0(msg_task_t, number_of_tasks);
 
-    for (i = 0; i < number_of_tasks; i++) {
+    for (int i = 0; i < number_of_tasks; i++) {
       sprintf(sprintf_buffer, "Task_%d", i);
-      todo[i] = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
+      todo[i] = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL);
     }
   }
 
@@ -49,21 +50,21 @@ static int master(int argc, char *argv[])
     workers_count = MSG_get_host_number();
     workers = xbt_dynar_to_array(MSG_hosts_as_dynar());
 
-    for (i = 0; i < workers_count; i++)
+    for (int i = 0; i < workers_count; i++)
       if(host_self == workers[i]) {
          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]);
+    for (int i = 0; i < workers_count; i++)
+      MSG_process_create("worker", worker, master_name, workers[i]);
   }
 
   XBT_INFO("Got %d workers and %Ld tasks to process", workers_count, number_of_tasks);
 
-  for (i = 0; i < number_of_tasks; i++) {
-    build_channel_name(channel,master_name, MSG_host_get_name(workers[i % workers_count]));
+  for (int i = 0; i < number_of_tasks; i++) {
+    build_channel_name(channel, master_name, MSG_host_get_name(workers[i % workers_count]));
 
     XBT_INFO("Sending \"%s\" to channel \"%s\"", todo[i]->name, channel);
 
@@ -72,7 +73,7 @@ static int master(int argc, char *argv[])
   }
 
   XBT_INFO ("All tasks have been dispatched. Let's tell everybody the computation is over.");
-  for (i = 0; i < workers_count; i++) {
+  for (int 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])));
   }
@@ -87,15 +88,14 @@ static int master(int argc, char *argv[])
 static int worker(int argc, char *argv[])
 {
   msg_task_t task = NULL;
-  XBT_ATTRIB_UNUSED int res;
   char channel[1024];
 
-  build_channel_name(channel,MSG_process_get_data(MSG_process_self()), MSG_host_get_name(MSG_host_self()));
+  build_channel_name(channel, MSG_process_get_data(MSG_process_self()), MSG_host_get_name(MSG_host_self()));
 
   XBT_INFO("Receiving on channel \"%s\"", channel);
 
   while (1) {
-    res = MSG_task_receive(&(task),channel);
+    int res = MSG_task_receive(&(task), channel);
     xbt_assert(res == MSG_OK, "MSG_task_receive failed");
     
     XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
@@ -117,7 +117,6 @@ static int worker(int argc, char *argv[])
 /** Main function */
 int main(int argc, char *argv[])
 {
-  msg_error_t res = MSG_OK;
 
   MSG_init(&argc, argv);
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
@@ -130,7 +129,7 @@ int main(int argc, char *argv[])
     MSG_function_register("worker", worker);
     MSG_launch_application(argv[2]);
   }
-  res = MSG_main();
+  msg_error_t res = MSG_main();
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
   return (res != MSG_OK);