X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9932a0c0d2c44e34633c97a827b2b04d615cb4e9..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/examples/msg/masterslave/masterslave_kill.c diff --git a/examples/msg/masterslave/masterslave_kill.c b/examples/msg/masterslave/masterslave_kill.c index 9c8e09ec34..91e99146df 100644 --- a/examples/msg/masterslave/masterslave_kill.c +++ b/examples/msg/masterslave/masterslave_kill.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2009-2014. The SimGrid Team. +/* Copyright (c) 2007, 2009-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ static int master(int argc, char *argv[]) msg_process_t bob = NULL; XBT_INFO("Hello!"); - bob = MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Fafard")); + bob = MSG_process_create("slave", slave, NULL, MSG_host_by_name("Fafard")); MSG_process_sleep(10.0); XBT_INFO("Resume process"); @@ -66,16 +66,11 @@ int main(int argc, char *argv[]) msg_error_t res = MSG_OK; MSG_init(&argc, argv); - if (argc < 3) { - XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]); - XBT_CRITICAL("example: %s msg_platform.xml msg_deployment_suspend.xml\n", - argv[0]); - exit(1); - } + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" + "\tExample: %s msg_platform.xml msg_deployment_suspend.xml\n", + argv[0], argv[0]); + test_all(argv[1], argv[2]); - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}