X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf944399509e0838e40a3fab1cd566329ecefff4..b8df87e176f27b25534f27d7e240defa32ca35bc:/examples/simdag/daxload/sd_daxload.c diff --git a/examples/simdag/daxload/sd_daxload.c b/examples/simdag/daxload/sd_daxload.c index ed2eb41839..388b69094e 100644 --- a/examples/simdag/daxload/sd_daxload.c +++ b/examples/simdag/daxload/sd_daxload.c @@ -1,13 +1,13 @@ /* simple test trying to load a DAX file. */ -/* Copyright (c) 2009-2015. The SimGrid Team. +/* Copyright (c) 2009-2019. 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/simdag.h" -#include "xbt/file.h" + #include #include @@ -44,7 +44,7 @@ int main(int argc, char **argv) if (!dax){ XBT_ERROR("A problem occurred during DAX parsing (cycle or syntax). Do not continue this test"); free(tracefilename); - SD_exit(); + exit(255); } @@ -81,7 +81,8 @@ int main(int argc, char **argv) XBT_INFO("------------------- Run the schedule ---------------------------"); SD_simulate(-1); XBT_INFO("------------------- Produce the trace file---------------------------"); - XBT_INFO("Producing the trace of the run into %s", xbt_basename(tracefilename)); + char* basename = strrchr(tracefilename, '/'); + XBT_INFO("Producing the trace of the run into %s", basename ? basename + 1 : tracefilename); FILE *out = fopen(tracefilename, "w"); xbt_assert(out, "Cannot write to %s", tracefilename); free(tracefilename); @@ -101,13 +102,12 @@ int main(int argc, char **argv) sg_host_get_name(wsl[0]), SD_task_get_amount(task), SD_task_get_name(task)); break; default: - xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task), SD_task_get_kind(task)); + xbt_die("Task %s is of unknown kind %u", SD_task_get_name(task), SD_task_get_kind(task)); } SD_task_destroy(task); } fclose(out); xbt_dynar_free_container(&dax); - SD_exit(); return 0; }