From 658b938700c7c9c7aed17c30863c6cd7219d899b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 6 Nov 2020 09:27:36 -0800 Subject: [PATCH] linker: add ld.config.txt parse time to systrace. Bug: http://b/172640358 Test: treehugger Change-Id: I9d6b7c1e200d2effb737508d3c282063edefa888 --- linker/linker.cpp | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/linker/linker.cpp b/linker/linker.cpp index 77f754cf4..2481be4e4 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -3458,23 +3458,19 @@ std::vector init_default_namespaces(const char* executable const Config* config = nullptr; - std::string error_msg; - - std::string ld_config_file_path = get_ld_config_file_path(executable_path); - - INFO("[ Reading linker config \"%s\" ]", ld_config_file_path.c_str()); - if (!Config::read_binary_config(ld_config_file_path.c_str(), - executable_path, - g_is_asan, - &config, - &error_msg)) { - if (!error_msg.empty()) { - DL_WARN("Warning: couldn't read \"%s\" for \"%s\" (using default configuration instead): %s", - ld_config_file_path.c_str(), - executable_path, - error_msg.c_str()); + { + std::string ld_config_file_path = get_ld_config_file_path(executable_path); + INFO("[ Reading linker config \"%s\" ]", ld_config_file_path.c_str()); + ScopedTrace trace(("linker config " + ld_config_file_path).c_str()); + std::string error_msg; + if (!Config::read_binary_config(ld_config_file_path.c_str(), executable_path, g_is_asan, + &config, &error_msg)) { + if (!error_msg.empty()) { + DL_WARN("Warning: couldn't read '%s' for '%s' (using default configuration instead): %s", + ld_config_file_path.c_str(), executable_path, error_msg.c_str()); + } + config = nullptr; } - config = nullptr; } if (config == nullptr) {