From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 19 Jan 2012 09:45:43 +0000 (+0100)
Subject: Inline test_all() in masterslave_mailbox.
X-Git-Tag: exp_20120216~119^2~75
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3f6f4cda91fafc2e04ed432f6f5bb38e4eaaf2df?ds=sidebyside

Inline test_all() in masterslave_mailbox.
---

diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c
index 551e38b79f..1273e90dfa 100644
--- a/examples/msg/masterslave/masterslave_mailbox.c
+++ b/examples/msg/masterslave/masterslave_mailbox.c
@@ -97,11 +97,21 @@ 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_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);
+  }
+  platform_file = argv[1];
+  application_file = argv[2];
 
   /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
@@ -115,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)