From: Arnaud Giersch Date: Wed, 9 Dec 2020 13:06:50 +0000 (+0100) Subject: Use dedicated function to get config value. X-Git-Tag: v3.26~25 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dfd90ca996d228729092cea91a19fe8128bc5470 Use dedicated function to get config value. --- diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp index d469422187..56d83bba19 100644 --- a/src/instr/instr_paje_events.cpp +++ b/src/instr/instr_paje_events.cpp @@ -29,7 +29,7 @@ StateEvent::StateEvent(Container* container, Type* type, PajeEventType event_typ : PajeEvent::PajeEvent(container, type, SIMIX_get_clock(), event_type), value(value), extra_(extra) { #if HAVE_SMPI - if (simgrid::config::get_value("smpi/trace-call-location")) { + if (smpi_cfg_trace_call_location()) { const smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); filename = loc->filename; linenumber = loc->linenumber; @@ -60,7 +60,7 @@ void StateEvent::print() stream_ << " " << ((extra_ != nullptr) ? extra_->display_size() : ""); #if HAVE_SMPI - if (simgrid::config::get_value("smpi/trace-call-location")) + if (smpi_cfg_trace_call_location()) stream_ << " \"" << filename << "\" " << linenumber; #endif } else if (trace_format == TraceFormat::Ti) { @@ -75,7 +75,7 @@ void StateEvent::print() container_name=std::to_string(stoi(container_name.erase(0, 5)) - 1); } #if HAVE_SMPI - if (config::get_value("smpi/trace-call-location")) + if (smpi_cfg_trace_call_location()) stream_ << container_name << " location " << filename << " " << linenumber << std::endl ; #endif stream_ << container_name << " " << extra_->print(); diff --git a/src/instr/instr_paje_header.cpp b/src/instr/instr_paje_header.cpp index 73f4559fd8..6cd678e4c6 100644 --- a/src/instr/instr_paje_header.cpp +++ b/src/instr/instr_paje_header.cpp @@ -6,6 +6,7 @@ #include "simgrid/Exception.hpp" #include "src/instr/instr_private.hpp" +#include "src/smpi/include/private.hpp" #include "xbt/virtu.h" /* xbt::cmdline */ extern std::ofstream tracing_file; @@ -143,7 +144,7 @@ void dump_header(bool basic, bool display_sizes) if (display_sizes) tracing_file << "% Size int" << std::endl; #if HAVE_SMPI - if (simgrid::config::get_value("smpi/trace-call-location")) { + if (smpi_cfg_trace_call_location()) { /* paje currently (May 2016) uses "Filename" and "Linenumber" as reserved words. We cannot use them... */ tracing_file << "% Fname string" << std::endl; tracing_file << "% Lnumber int" << std::endl;