cleanup in teshsuite/msg

[simgrid.git] / teshsuite / msg / process_join / process_join.c

diff --git a/teshsuite/msg/process_join/process_join.c b/teshsuite/msg/process_join/process_join.c
index 8f6e9d8..87f5245 100644 (file)
--- a/teshsuite/msg/process_join/process_join.c
+++ b/teshsuite/msg/process_join/process_join.c
@@ -1,42 +1,37 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. 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. */
 
-#include <stdio.h>
-#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h"         /* calloc, printf */
+#include "simgrid/msg.h"
 
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.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");
 
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
+static int slave(int argc, char *argv[])
+{
+  XBT_INFO("Slave started");
+  MSG_process_sleep(3);
+  XBT_INFO("I'm done. See you!");
+  return 0;
+}
 
-/** Emitter function  */
-int master(int argc, char *argv[])
+static int master(int argc, char *argv[])
 {
   msg_process_t process;
 
   XBT_INFO("Start slave");
-  process =  MSG_process_create("slave from master",
-                               slave, NULL, MSG_host_self());
+  process =  MSG_process_create("slave from master", slave, NULL, MSG_host_self());
   XBT_INFO("Join the slave (timeout 2)");
   MSG_process_join(process, 2);
 
   XBT_INFO("Start slave");
-  process =  MSG_process_create("slave from master",
-                               slave, NULL, MSG_host_self());
+  process =  MSG_process_create("slave from master", slave, NULL, MSG_host_self());
   XBT_INFO("Join the slave (timeout 4)");
   MSG_process_join(process, 4);
 
   XBT_INFO("Start slave");
-  process =  MSG_process_create("slave from master",
-                               slave, NULL, MSG_host_self());
+  process =  MSG_process_create("slave from master", slave, NULL, MSG_host_self());
   XBT_INFO("Join the slave (timeout 2)");
   MSG_process_join(process, 2);
 
@@ -46,49 +41,25 @@ int master(int argc, char *argv[])
 
   XBT_INFO("Goodbye now!");
   return 0;
-}                               /* end_of_master */
-
-/** Receiver function  */
-int slave(int argc, char *argv[])
-{
-  XBT_INFO("Slave started");
-  MSG_process_sleep(3);
-  XBT_INFO("I'm done. See you!");
-  return 0;
-}                               /* end_of_slave */
+}
 
-/** Main function */
 int main(int argc, char *argv[])
 {
   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_create_environment(platform_file);
-  }
-  {                             /*   Application deployment */
-    MSG_function_register("master", master);
-    MSG_function_register("slave", slave);
-
-    MSG_launch_application(application_file);
-  }
+  xbt_assert(argc == 3, "Usage: %s platform_file deployment_file\n"
+             "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+
+  MSG_create_environment(argv[1]);
+
+  MSG_function_register("master", master);
+  MSG_function_register("slave", slave);
+  MSG_launch_application(argv[2]);
+
   res = MSG_main();
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  return res != MSG_OK;
+}