X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..df12bbc75c274351f3b3a628740e0b3270f08e18:/examples/msg/masterslave/masterslave_console.c
diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c
index eff59091a9..6a1aec97d8 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
+ *
+ * - masterslave/masterslave_console.c: 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
+ * masterslave/masterslave_script.lua, which demonstrates
+ * how to express the platform and deployment in lua.
+ *
+ */
+
#include
#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[])
{
@@ -102,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);
@@ -120,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]);