From: Martin Quinson Date: Sun, 26 Apr 2015 21:40:20 +0000 (+0200) Subject: revamp the start_kill test to greatly improve the coverage X-Git-Tag: v3_12~732^2~50^2~1 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8ecbd395417cd1c6f4ad9d3c1a8a44df67d3b2d9 revamp the start_kill test to greatly improve the coverage --- diff --git a/examples/msg/start_kill_time/deployment.xml b/examples/msg/start_kill_time/deployment.xml index fefeb8e1dc..c9b5c37ec1 100644 --- a/examples/msg/start_kill_time/deployment.xml +++ b/examples/msg/start_kill_time/deployment.xml @@ -1,10 +1,8 @@ - - - - - - + + + + diff --git a/examples/msg/start_kill_time/deployment_kill.xml b/examples/msg/start_kill_time/deployment_kill.xml index 39cdf4e27b..056979d3ec 100644 --- a/examples/msg/start_kill_time/deployment_kill.xml +++ b/examples/msg/start_kill_time/deployment_kill.xml @@ -1,10 +1,7 @@ - - - - - - + + + diff --git a/examples/msg/start_kill_time/deployment_start.xml b/examples/msg/start_kill_time/deployment_start.xml index 203df2bc22..39af2ab593 100644 --- a/examples/msg/start_kill_time/deployment_start.xml +++ b/examples/msg/start_kill_time/deployment_start.xml @@ -1,10 +1,10 @@ - - - - - - + + + + + + diff --git a/examples/msg/start_kill_time/deployment_start_kill.xml b/examples/msg/start_kill_time/deployment_start_kill.xml index d4beac46e7..0a6d5cad3c 100644 --- a/examples/msg/start_kill_time/deployment_start_kill.xml +++ b/examples/msg/start_kill_time/deployment_start_kill.xml @@ -1,10 +1,10 @@ - - - - - - + + + + + + diff --git a/examples/msg/start_kill_time/sk_time.c b/examples/msg/start_kill_time/sk_time.c index af50303903..3ade8f030e 100644 --- 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, 2012-2014. 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 "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/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(); diff --git a/examples/msg/start_kill_time/start_kill_time.tesh b/examples/msg/start_kill_time/start_kill_time.tesh index 4e98d61fad..b0cd29c9c0 100644 --- a/examples/msg/start_kill_time/start_kill_time.tesh +++ b/examples/msg/start_kill_time/start_kill_time.tesh @@ -3,57 +3,61 @@ p Test0 Process without time $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:master@node-0.acme.org) Hello! -> [ 0.000000] (2:slave@node-1.acme.org) Hello! -> [ 0.000000] (3:slave@node-2.acme.org) Hello! -> [ 0.000000] (4:slave@node-3.acme.org) Hello! -> [ 0.000000] (5:slave@node-4.acme.org) Hello! -> [ 0.000000] (6:slave@node-5.acme.org) Hello! -> [ 10.000000] (6:slave@node-5.acme.org) OK, goodbye now. -> [ 10.000000] (1:master@node-0.acme.org) OK, goodbye now. -> [ 10.000000] (2:slave@node-1.acme.org) OK, goodbye now. -> [ 10.000000] (3:slave@node-2.acme.org) OK, goodbye now. -> [ 10.000000] (4:slave@node-3.acme.org) OK, goodbye now. -> [ 10.000000] (5:slave@node-4.acme.org) OK, goodbye now. +> [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. +> [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping. +> [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). > [ 10.000000] (0:@) Simulation time 10 p Test1 Process with start time $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:master@node-0.acme.org) Hello! -> [ 1.000000] (2:slave@node-1.acme.org) Hello! -> [ 2.000000] (3:slave@node-2.acme.org) Hello! -> [ 3.000000] (4:slave@node-3.acme.org) Hello! -> [ 4.000000] (5:slave@node-4.acme.org) Hello! -> [ 5.000000] (6:slave@node-5.acme.org) Hello! -> [ 10.000000] (1:master@node-0.acme.org) OK, goodbye now. -> [ 11.000000] (2:slave@node-1.acme.org) OK, goodbye now. -> [ 12.000000] (3:slave@node-2.acme.org) OK, goodbye now. -> [ 13.000000] (4:slave@node-3.acme.org) OK, goodbye now. -> [ 14.000000] (5:slave@node-4.acme.org) OK, goodbye now. -> [ 15.000000] (6:slave@node-5.acme.org) OK, goodbye now. +> [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. +> [ 1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep. +> [ 2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep. +> [ 3.000000] (4:sleeper@node-3.acme.org) Hello! I go to sleep. +> [ 4.000000] (5:sleeper@node-4.acme.org) Hello! I go to sleep. +> [ 5.000000] (6:sleeper@node-5.acme.org) Hello! I go to sleep. +> [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping. +> [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). +> [ 11.000000] (2:sleeper@node-1.acme.org) Done sleeping. +> [ 11.000000] (2:sleeper@node-1.acme.org) Exiting now (done sleeping or got killed). +> [ 12.000000] (3:sleeper@node-2.acme.org) Done sleeping. +> [ 12.000000] (3:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). +> [ 13.000000] (4:sleeper@node-3.acme.org) Done sleeping. +> [ 13.000000] (4:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). +> [ 14.000000] (5:sleeper@node-4.acme.org) Done sleeping. +> [ 14.000000] (5:sleeper@node-4.acme.org) Exiting now (done sleeping or got killed). +> [ 15.000000] (6:sleeper@node-5.acme.org) Done sleeping. +> [ 15.000000] (6:sleeper@node-5.acme.org) Exiting now (done sleeping or got killed). > [ 15.000000] (0:@) Simulation time 15 p Test1 Process with kill time $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:master@node-0.acme.org) Hello! -> [ 0.000000] (2:slave@node-1.acme.org) Hello! -> [ 0.000000] (3:slave@node-2.acme.org) Hello! -> [ 0.000000] (4:slave@node-3.acme.org) Hello! -> [ 0.000000] (5:slave@node-4.acme.org) Hello! -> [ 0.000000] (6:slave@node-5.acme.org) Hello! -> [ 10.000000] (1:master@node-0.acme.org) OK, goodbye now. -> [ 10.000000] (0:@) Simulation time 10 +> [ 0.000000] (1:sleeper@node-1.acme.org) Hello! I go to sleep. +> [ 0.000000] (2:sleeper@node-2.acme.org) Hello! I go to sleep. +> [ 0.000000] (3:sleeper@node-3.acme.org) Hello! I go to sleep. +> [ 6.000000] (1:sleeper@node-1.acme.org) Exiting now (done sleeping or got killed). +> [ 6.000000] (2:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). +> [ 6.000000] (3:sleeper@node-3.acme.org) Done sleeping. +> [ 6.000000] (3:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). +> [ 6.000000] (0:@) Simulation time 6 p Test2 Process with start and kill times $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:master@node-0.acme.org) Hello! -> [ 1.000000] (2:slave@node-1.acme.org) Hello! -> [ 2.000000] (3:slave@node-2.acme.org) Hello! -> [ 3.000000] (4:slave@node-3.acme.org) Hello! -> [ 4.000000] (5:slave@node-4.acme.org) Hello! -> [ 5.000000] (6:slave@node-5.acme.org) Hello! -> [ 10.000000] (1:master@node-0.acme.org) OK, goodbye now. +> [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. +> [ 1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep. +> [ 2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep. +> [ 3.000000] (4:sleeper@node-3.acme.org) Hello! I go to sleep. +> [ 4.000000] (5:sleeper@node-4.acme.org) Hello! I go to sleep. +> [ 5.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). +> [ 5.000000] (6:sleeper@node-5.acme.org) Hello! I go to sleep. +> [ 6.000000] (2:sleeper@node-1.acme.org) Exiting now (done sleeping or got killed). +> [ 6.000000] (3:sleeper@node-2.acme.org) Done sleeping. +> [ 6.000000] (3:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). +> [ 7.000000] (4:sleeper@node-3.acme.org) Done sleeping. +> [ 7.000000] (4:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). +> [ 9.000000] (5:sleeper@node-4.acme.org) Exiting now (done sleeping or got killed). +> [ 10.000000] (6:sleeper@node-5.acme.org) Exiting now (done sleeping or got killed). > [ 10.000000] (0:@) Simulation time 10