X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7fd8e8ffb447edb19f32e3200a7dbef3d83138b6..0d08efd41a22b0813a99a3c206152d2edcbf3f00:/src/surf/xml/surfxml_sax_cb.cpp diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 1b920ef2a5..0448bd70eb 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ @@ -777,7 +777,7 @@ void ETag_surfxml_bypassZoneRoute() } void ETag_surfxml_trace(){ - simgrid::kernel::routing::TraceCreationArgs trace; + simgrid::kernel::routing::ProfileCreationArgs trace; trace.id = A_surfxml_trace_id; trace.file = A_surfxml_trace_file; @@ -968,10 +968,11 @@ void surf_parse_open(std::string file) surf_parsed_filename = file; std::string dir = simgrid::xbt::Path(file).get_dir_name(); surf_path.push_back(dir); + std::string cwd = simgrid::xbt::Path().get_dir_name(); surf_file_to_parse = surf_fopen(file, "r"); if (surf_file_to_parse == nullptr) - xbt_die("Unable to open '%s'\n", file.c_str()); + xbt_die("Unable to open '%s' from '%s'\n", file.c_str(), cwd.c_str()); surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE); surf_parse__switch_to_buffer(surf_input_buffer); surf_parse_lineno = 1;