X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05400c7ba9980ef221912b7cee424a8e0a263866..693f30b46244c152cd79cdf3ad35d4a79b866c9c:/examples/msg/masterslave/masterslave_mailbox.c

diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c
index fd81fcb7f8..3543f2371d 100644
--- a/examples/msg/masterslave/masterslave_mailbox.c
+++ b/examples/msg/masterslave/masterslave_mailbox.c
@@ -68,19 +68,19 @@ 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];
-  int read;
+  _XBT_GNUC_UNUSED int read;
 
   read = sscanf(argv[1], "%d", &id);
-  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+  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");
 
 //  XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
@@ -97,15 +97,24 @@ int slave(int argc, char *argv[])
   return 0;
 }                               /* end_of_slave */
 
-/** Test function */
-MSG_error_t test_all(const char *platform_file,
-                     const char *application_file)
+/** Main function */
+int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  MSG_error_t res;
+  const char *platform_file;
+  const char *application_file;
+
+  MSG_init(&argc, argv);
+  if (argc < 3) {
+    printf("Usage: %s platform_file deployment_file\n", argv[0]);
+    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
+    exit(1);
+  }
+  platform_file = argv[1];
+  application_file = argv[2];
 
   /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
-    MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
@@ -116,22 +125,6 @@ MSG_error_t test_all(const char *platform_file,
   res = MSG_main();
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
-  return res;
-}                               /* end_of_test_all */
-
-
-/** Main function */
-int main(int argc, char *argv[])
-{
-  MSG_error_t res = MSG_OK;
-
-  MSG_global_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
-    exit(1);
-  }
-  res = test_all(argv[1], argv[2]);
   MSG_clean();
 
   if (res == MSG_OK)