X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..b65614d53e1cba701db0f7902da139f98bb49a1a:/examples/msg/masterslave/masterslave_console.c

diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c
index eff59091a9..d49df00eea 100644
--- 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 */
@@ -16,12 +26,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 
 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;
+msg_error_t test_all(const char *);
 
 /** Emitter function  */
 int master(int argc, char *argv[])
@@ -37,7 +42,7 @@ int master(int argc, char *argv[])
   for (i = 0; i < number_of_tasks; i++) {
     char mailbox[256];
     char sprintf_buffer[256];
-    m_task_t task = NULL;
+    msg_task_t task = NULL;
 
     sprintf(mailbox, "slave-%ld", i % slaves_count);
     sprintf(sprintf_buffer, "Task_%d", i);
@@ -56,7 +61,7 @@ int master(int argc, char *argv[])
     char mailbox[80];
 
     sprintf(mailbox, "slave-%ld", i % slaves_count);
-    m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+    msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_send(finalize, mailbox);
   }
 
@@ -67,7 +72,7 @@ int master(int argc, char *argv[])
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
   _XBT_GNUC_UNUSED int res;
   int id = -1;
   char mailbox[80];
@@ -99,11 +104,10 @@ int slave(int argc, char *argv[])
 }                               /* end_of_slave */
 
 /** Test function */
-MSG_error_t test_all(const char *file)  //(void)
+msg_error_t test_all(const char *file)  //(void)
 {
-  MSG_error_t res = MSG_OK;
-  /*  Simulation setting */
-  MSG_set_channel_number(MAX_CHANNEL);
+  msg_error_t res = MSG_OK;
+
   /*start by registering functions before loading script */
   MSG_function_register("master", master);
   MSG_function_register("slave", slave);
@@ -118,16 +122,15 @@ MSG_error_t test_all(const char *file)  //(void)
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  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]);
     exit(1);
   }
   res = test_all(argv[1]);
-  MSG_clean();
 
   if (res == MSG_OK)
     return 0;