X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec353ddb75a8fc57fb3b1243fed37e0df06f7305..f84aecd6adbd11b2e31a6cd47016bc03aa778a6e:/examples/smpi/replay_multiple/replay_multiple.c diff --git a/examples/smpi/replay_multiple/replay_multiple.c b/examples/smpi/replay_multiple/replay_multiple.c index a7cfeb5a96..7c75a0bf80 100644 --- a/examples/smpi/replay_multiple/replay_multiple.c +++ b/examples/smpi/replay_multiple/replay_multiple.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2015. The SimGrid Team. +/* Copyright (c) 2009-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,6 +7,9 @@ #include "simgrid/msg.h" #include "mpi.h" +#include +#include + XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); static int smpi_replay(int argc, char *argv[]) { @@ -18,6 +21,7 @@ int main(int argc, char *argv[]){ msg_error_t res; MSG_init(&argc, argv); + SMPI_init(); xbt_assert(argc > 3, "Usage: %s description_file platform_file deployment_file\n" "\tExample: %s smpi_multiple_apps msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]); @@ -29,10 +33,10 @@ int main(int argc, char *argv[]){ FILE* fp = fopen(argv[1], "r"); if (fp == NULL) xbt_die("Cannot open %s", argv[1]); - char *line = NULL; - size_t n = 0; + char line[2048]; const char* instance_id = NULL; - while (xbt_getline(&line, &n, fp) != -1 ){ + while (fgets(line, sizeof line, fp)) { + xbt_assert(1 + strlen(line) < sizeof line, "input buffer too short (read: %s)", line); xbt_dynar_t elems = xbt_str_split_quoted_in_place(line); if(xbt_dynar_length(elems)<3){ xbt_die ("Not enough elements in the line"); @@ -47,12 +51,10 @@ int main(int argc, char *argv[]){ xbt_free(line_char); } - xbt_free(line); fclose(fp); MSG_launch_application(argv[3]); - SMPI_init(); res = MSG_main();