mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-26 00:01:45 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: activity: better report nil than ffff in unknown callers

Browse Source 
For unknown callers we try to get the lowest known address and we
purposely ignore NULL during calculation of the min. But the side
effect is that we also report ffff in the per-DSO address. Better
catch this case and finally accept to report nil. Before it would
report this:

  $ socat - /tmp/sock1 <<< "show profiling memory" |grep nil
        50000          10        9600000           9440|            (nil) [other] unknown(192) [delta=9590560] [pool=http_txn]
        50000          10        9600000           9440|            (nil) DSO:other; delta_calls=49990; delta_bytes=9590560

now it reports this:

  $ socat - /tmp/sock1 <<< "show profiling memory" |grep nil
        50000          11        9600000           9656|            (nil) [other] unknown(192) [delta=9590344] [pool=connection]
        50000          11        9600000           9656|            (nil) DSO:other; delta_calls=49989; delta_bytes=9590344
This commit is contained in:
Willy Tarreau 2024-11-21 10:28:14 +01:00
parent ed3ed35867
commit f3547d0b74
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/activity.c
View File

@ -951,7 +951,7 @@ static int cli_io_handler_show_profiling(struct appctx *appctx)
chunk_appendf(&trash, "%11llu %11llu %14llu %14llu| %16p DSO:%s;", chunk_appendf(&trash, "%11llu %11llu %14llu %14llu| %16p DSO:%s;",
entry->alloc_calls, entry->free_calls, entry->alloc_calls, entry->free_calls,
entry->alloc_tot, entry->free_tot, entry->alloc_tot, entry->free_tot,
entry->caller, entry->info ? (const char*)entry->info : "other"); entry->caller == (void*)-1 ? 0 : entry->caller, entry->info ? (const char*)entry->info : "other");
if (entry->alloc_tot != entry->free_tot) if (entry->alloc_tot != entry->free_tot)
chunk_appendf(&trash, " delta_calls=%lld; delta_bytes=%lld", chunk_appendf(&trash, " delta_calls=%lld; delta_bytes=%lld",