Add MSG_process_join [#13601]

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

diff --git a/teshsuite/msg/pid.c b/teshsuite/msg/pid.c
index 1f04fb2..0fee70a 100644 (file)
--- a/teshsuite/msg/pid.c
+++ b/teshsuite/msg/pid.c
@@ -1,44 +1,48 @@
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2010, 2013-2014. 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 "msg/msg.h"
-#include "xbt/sysdep.h"        
+#include "xbt/sysdep.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
-char* mailbox = "mailbox";
+const char* mailbox = "mailbox";
 #define task_comp_size 1000
 #define task_comm_size 100000
 
-int onexit(void* data){
-  XBT_INFO("Process \"%d\" killed.", *((int*)data));  
+static int onexit(smx_process_exit_status_t status, int *pid){
+  XBT_INFO("Process \"%d\" killed.", *pid);
+  return 0;
 }
 
-int sendpid(int argc, char *argv[])
+static int sendpid(int argc, char *argv[])
 {
   int pid = MSG_process_self_PID();
-  MSG_process_on_exit(onexit, &pid);  
+  MSG_process_on_exit((int_f_pvoid_pvoid_t)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);
   XBT_INFO("Send of pid \"%d\" done.", pid);
   MSG_process_suspend(MSG_process_self());
+  return 0;
 }
 
-int killall(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);
-    int pid = *((int*)MSG_task_get_data(task));
+    int pid = *(int*)MSG_task_get_data(task);
+    MSG_task_destroy(task);
     XBT_INFO("Killing process \"%d\".", pid);
     MSG_process_kill(MSG_process_from_PID(pid));
     task = NULL;
   }
+  return 0;
 }
 
 /** Main function */
@@ -52,10 +56,10 @@ int main(int argc, char *argv[])
   MSG_function_register("sendpid", &sendpid);
   MSG_function_register("killall", &killall);
 
-  MSG_process_killall(atoi(argv[2]));
+  MSG_process_killall(atoi(argv[3]));
 
   MSG_create_environment(argv[1]);
-  MSG_launch_application(argv[1]);
+  MSG_launch_application(argv[2]);
   res = MSG_main();
 
   if (res == MSG_OK)