X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ab3513687a36569218810261a173e189a9af5a5..1a4fbd7770910a461be806b05bff0dfdf9a87e5e:/teshsuite/msg/process/process.c?ds=sidebyside diff --git a/teshsuite/msg/process/process.c b/teshsuite/msg/process/process.c index e999b4bed0..5c752029b9 100644 --- a/teshsuite/msg/process/process.c +++ b/teshsuite/msg/process/process.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2010-2014. The SimGrid Team. +/* Copyright (c) 2010-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 -#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, printf */ /* Create a log channel to have nice outputs. */ @@ -78,15 +78,12 @@ int main(int argc, char *argv[]) const char *application_file; MSG_init(&argc, argv); - if (argc != 3) { - printf("Usage: %s platform_file deployment_file\n", argv[0]); - printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]); - exit(1); - } + xbt_assert(argc == 3, "Usage: %s platform_file deployment_file\n" + "\n Example: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]); + platform_file = argv[1]; application_file = argv[2]; - /* MSG_config("workstation/model","KCCFLN05"); */ { /* Simulation setting */ MSG_create_environment(platform_file); } @@ -100,8 +97,5 @@ int main(int argc, char *argv[]) XBT_INFO("Simulation time %g", MSG_get_clock()); - if (res == MSG_OK) - return 0; - else - return 1; + return res != MSG_OK; } /* end_of_main */