Merge branch 'master' of git+ssh://scm.gforge.inria.fr/gitroot/simgrid/simgrid

[simgrid.git] / examples / msg / start_kill_time / sk_time.c

diff --git a/examples/msg/start_kill_time/sk_time.c b/examples/msg/start_kill_time/sk_time.c
index af61d37..3ade8f0 100644 (file)
--- a/examples/msg/start_kill_time/sk_time.c
+++ b/examples/msg/start_kill_time/sk_time.c
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2010, 2012-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 "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "simgrid/msg.h"        /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
 #include "xbt/sysdep.h"         /* calloc */
 
 /* Create a log channel to have nice outputs. */
@@ -12,22 +12,20 @@
 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[])
-{
-  XBT_INFO("Hello!");
-  MSG_process_sleep(10.0);
-  XBT_INFO("OK, goodbye now.");
+static int my_onexit(void* ignored1, void *ignored2) {
+  XBT_INFO("Exiting now (done sleeping or got killed).");
   return 0;
-}                               /* end_of_lazy_guy */
+}
 
-static int master(int argc, char *argv[])
+static int sleeper(int argc, char *argv[])
 {
-  XBT_INFO("Hello!");
-  MSG_process_sleep(10.0);
-  XBT_INFO("OK, goodbye now.");
+  XBT_INFO("Hello! I go to sleep.");
+  MSG_process_on_exit(my_onexit, NULL);
+   
+  MSG_process_sleep(atoi(argv[1]));
+  XBT_INFO("Done sleeping.");
   return 0;
-}                               /* end_of_dram_master */
+}
 
 /** Test function */
 static msg_error_t test_all(const char *platform_file,
@@ -36,8 +34,7 @@ static msg_error_t test_all(const char *platform_file,
   msg_error_t res = MSG_OK;
 
   MSG_create_environment(platform_file);
-  MSG_function_register("master", master);
-  MSG_function_register("slave", slave);
+  MSG_function_register("sleeper", sleeper);
   MSG_launch_application(application_file);
 
   res = MSG_main();
@@ -60,7 +57,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
   test_all(argv[1], argv[2]);
-  res = MSG_clean();
 
   if (res == MSG_OK)
     return 0;