mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: tools: resolve main() only once in resolve_sym_name()

Browse Source 
resolv_sym_name() calls dladdr(main) for each symbol in order to compare
the first address with other symbols. But this is pointless and quite
expensive in outputs to "show profiling" for example. Let's just keep a
local copy and have a variable indicating if the resolution is needed/
in progress/done to save the value for subsequent calls.
This commit is contained in:
Willy Tarreau 2024-11-21 14:14:49 +01:00
parent 9a8b834435
commit a205a91bb3
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tools.c
View File

@ -5536,7 +5536,9 @@ const void *resolve_sym_name(struct buffer *buf, const char *pfx, const void *ad
};
#if (defined(__ELF__) && !defined(__linux__)) || defined(USE_DL)
Dl_info dli, dli_main;
static Dl_info dli_main;
static int dli_main_done; // 0 = not resolved, 1 = resolve in progress, 2 = done
Dl_info dli;
size_t size;
const char *fname, *p;
#endif
@ -5561,8 +5563,21 @@ const void *resolve_sym_name(struct buffer *buf, const char *pfx, const void *ad
* that contains the main function. The name is picked between last '/'
* and first following '.'.
*/
if (!dladdr(main, &dli_main))
dli_main.dli_fbase = NULL;
/* let's check main only once, no need to do it all the time */
i = HA_ATOMIC_LOAD(&dli_main_done);
while (i < 2) {
i = 0;
if (HA_ATOMIC_CAS(&dli_main_done, &i, 1)) {
/* we're the first ones, resolve it */
if (!dladdr(main, &dli_main))
dli_main.dli_fbase = NULL;
HA_ATOMIC_STORE(&dli_main_done, 2); // done
break;
}
ha_thread_relax();
}
if (dli_main.dli_fbase != dli.dli_fbase) {
fname = dli.dli_fname;