Merge remote-tracking branch 'origin/master'

[simgrid.git] / examples / msg / masterslave / masterslave_console.c

diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c
index 978bf70..6a1aec9 100644 (file)
--- a/examples/msg/masterslave/masterslave_console.c
+++ b/examples/msg/masterslave/masterslave_console.c
@@ -1,9 +1,19 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
- * 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. */
 
+/** @addtogroup MSG_examples
+ * 
+ * - <b>masterslave/masterslave_console.c</b>: demonstrate how to use
+ *   lua files instead of XML for the platform and deployment
+ *   declaration using @ref MSG_load_platform_script. The most
+ *   interesting part is probably not the C code, but rather the
+ *   <b>masterslave/masterslave_script.lua</b>, which demonstrates
+ *   how to express the platform and deployment in lua. 
+ *
+ */
+
 #include <stdio.h>
 #include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
 #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
@@ -18,11 +28,6 @@ int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
 MSG_error_t test_all(const char *);
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
 /** Emitter function  */
 int master(int argc, char *argv[])
 {
@@ -32,7 +37,7 @@ int master(int argc, char *argv[])
   long slaves_count = atol(argv[4]);
   int i;
 
-  INFO2("Got %ld slaves and %ld tasks to process", slaves_count,
+  XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count,
         number_of_tasks);
   for (i = 0; i < number_of_tasks; i++) {
     char mailbox[256];
@@ -45,12 +50,12 @@ int master(int argc, char *argv[])
         MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
                         NULL);
     if (number_of_tasks < 10000 || i % 10000 == 0)
-      INFO3("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name,
+      XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name,
             number_of_tasks, mailbox);
     MSG_task_send(task, mailbox);
   }
 
-  INFO0
+  XBT_INFO
       ("All tasks have been dispatched. Let's tell everybody the computation is over.");
   for (i = 0; i < slaves_count; i++) {
     char mailbox[80];
@@ -60,7 +65,7 @@ int master(int argc, char *argv[])
     MSG_task_send(finalize, mailbox);
   }
 
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
   return 0;
 }                               /* end_of_master */
 
@@ -68,32 +73,33 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
+  _XBT_GNUC_UNUSED int res;
   int id = -1;
   char mailbox[80];
+  _XBT_GNUC_UNUSED int read;
 
-  xbt_assert1(sscanf(argv[1], "%d", &id),
-              "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[1], "%d", &id);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
 
   sprintf(mailbox, "slave-%d", id);
 
   while (1) {
     res = MSG_task_receive(&(task), mailbox);
-    xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+    xbt_assert(res == MSG_OK, "MSG_task_get failed");
 
-    INFO1("Received \"%s\"", MSG_task_get_name(task));
+    XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
       MSG_task_destroy(task);
       break;
     }
 
-    INFO1("Processing \"%s\"", MSG_task_get_name(task));
+    XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
     MSG_task_execute(task);
-    INFO1("\"%s\" done", MSG_task_get_name(task));
+    XBT_INFO("\"%s\" done", MSG_task_get_name(task));
     MSG_task_destroy(task);
     task = NULL;
   }
-  INFO0("I'm done. See you!");
+  XBT_INFO("I'm done. See you!");
   return 0;
 }                               /* end_of_slave */
 
@@ -101,8 +107,7 @@ int slave(int argc, char *argv[])
 MSG_error_t test_all(const char *file)  //(void)
 {
   MSG_error_t res = MSG_OK;
-  /*  Simulation setting */
-  MSG_set_channel_number(MAX_CHANNEL);
+
   /*start by registering functions before loading script */
   MSG_function_register("master", master);
   MSG_function_register("slave", slave);
@@ -110,7 +115,7 @@ MSG_error_t test_all(const char *file)  //(void)
 
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }                               /* end_of_test_all */
 
@@ -119,7 +124,7 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 2) {
     printf("Usage: %s platform_script[.lua]\n", argv[0]);
     printf("example: %s platform_script.lua\n", argv[0]);