bug-- and a bit less brain overload

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

diff --git a/teshsuite/msg/pid/pid.c b/teshsuite/msg/pid/pid.c
index 015017c..ebe6b3a 100644 (file)
--- a/teshsuite/msg/pid/pid.c
+++ b/teshsuite/msg/pid/pid.c
@@ -1,19 +1,18 @@
-/* Copyright (c) 2009-2010, 2013-2014. The SimGrid Team.
+/* Copyright (c) 2009-2010, 2013-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 "simgrid/msg.h"
-#include "xbt/sysdep.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");
+
 const char* mailbox = "mailbox";
 #define task_comp_size 1000
 #define task_comm_size 100000
 
-static int onexit(smx_process_exit_status_t status, int *pid){
+static int my_onexit(smx_process_exit_status_t status, int *pid){
   XBT_INFO("Process \"%d\" killed.", *pid);
   return 0;
 }
@@ -21,7 +20,7 @@ static int onexit(smx_process_exit_status_t status, int *pid){
 static int sendpid(int argc, char *argv[])
 {
   int pid = MSG_process_self_PID();
-  MSG_process_on_exit((int_f_pvoid_pvoid_t)onexit, &pid);
+  MSG_process_on_exit((int_f_pvoid_pvoid_t)my_onexit, &pid);
   msg_task_t task = MSG_task_create("pid", task_comp_size, task_comm_size, &pid);
   XBT_INFO("Sending pid of \"%d\".", pid);
   MSG_task_send(task, mailbox);
@@ -32,10 +31,9 @@ static int sendpid(int argc, char *argv[])
 
 static int killall(int argc, char *argv[]){
   msg_task_t task = NULL;
-  _XBT_GNUC_UNUSED int res;
-  int i;
-  for (i=0; i<3;i++) {
-    res = MSG_task_receive(&(task), mailbox);
+
+  for (int i=0; i<3;i++) {
+    MSG_task_receive(&(task), mailbox);
     int pid = *(int*)MSG_task_get_data(task);
     MSG_task_destroy(task);
     XBT_INFO("Killing process \"%d\".", pid);
@@ -45,25 +43,19 @@ static int killall(int argc, char *argv[]){
   return 0;
 }
 
-/** Main function */
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
-  msg_error_t res = MSG_OK;
-
   MSG_init(&argc, argv);
 
-  /*   Application deployment */
-  MSG_function_register("sendpid", &sendpid);
-  MSG_function_register("killall", &killall);
+  xbt_assert(argc >= 2, "Usage: pid platform pid_to_kill");
 
-  MSG_process_killall(atoi(argv[3]));
+  MSG_process_killall(atoi(argv[2]));
 
   MSG_create_environment(argv[1]);
-  MSG_launch_application(argv[2]);
-  res = MSG_main();
+  MSG_process_create("sendpid", sendpid, NULL, MSG_get_host_by_name("Tremblay"));
+  MSG_process_create("sendpid", sendpid, NULL, MSG_get_host_by_name("Tremblay"));
+  MSG_process_create("sendpid", sendpid, NULL, MSG_get_host_by_name("Tremblay"));
+  MSG_process_create("killall", killall, NULL, MSG_get_host_by_name("Tremblay"));
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return MSG_main() != MSG_OK;
 }