X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a42d0b4d34e2b9777922430ef85646dabbefa20..53b9ff1b6972dffeabd543a09c89170663c30ad1:/examples/msg/masterslave/masterslave_kill.c?ds=sidebyside

diff --git a/examples/msg/masterslave/masterslave_kill.c b/examples/msg/masterslave/masterslave_kill.c
index 316516e16f..365ebb3427 100644
--- a/examples/msg/masterslave/masterslave_kill.c
+++ b/examples/msg/masterslave/masterslave_kill.c
@@ -4,13 +4,9 @@
 /* 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. */
 
-#include "simgrid/msg.h"        /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
-#include "xbt/sysdep.h"         /* calloc */
+#include "simgrid/msg.h"
 
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 /** Lazy guy function. This process suspends itself asap.  */
 static int slave(int argc, char *argv[])
@@ -22,7 +18,7 @@ static int slave(int argc, char *argv[])
   MSG_task_execute(MSG_task_create("toto", 1e9, 0, NULL));
   XBT_INFO("Bye!");
   return 0;
-}                               /* end_of_lazy_guy */
+}
 
 static int master(int argc, char *argv[])
 {
@@ -40,37 +36,25 @@ static int master(int argc, char *argv[])
 
   XBT_INFO("OK, goodbye now.");
   return 0;
-}                               /* end_of_dram_master */
+}
 
-/** Test function */
-static msg_error_t test_all(const char *platform_file,
-                            const char *application_file)
+int main(int argc, char *argv[])
 {
   msg_error_t res = MSG_OK;
 
-  MSG_create_environment(platform_file);
+  MSG_init(&argc, argv);
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+             "\tExample: %s msg_platform.xml msg_deployment_suspend.xml\n", argv[0], argv[0]);
+
+  MSG_create_environment(argv[1]);
+
   MSG_function_register("master", master);
   MSG_function_register("slave", slave);
-  MSG_launch_application(application_file);
+  MSG_launch_application(argv[2]);
 
   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_init(&argc, argv);
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-	          "\tExample: %s msg_platform.xml msg_deployment_suspend.xml\n", 
-	          argv[0], argv[0]);
-
-  test_all(argv[1], argv[2]);
 
   return res != MSG_OK;
 }