Skip to content

support ptmalloc(glibc 2.42) #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanqi27 merged 2 commits into from
Mar 18, 2026
Merged

support ptmalloc(glibc 2.42) #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd95eca
support ptmalloc(glibc 2.42)
Mar 17, 2026
e154a35
fix compiler error
Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 52 additions & 36 deletions gdbplus/gdb-16.3/gdb/heap_ptmalloc_2_35.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
/*
* Per-thread cache is added since GNU C Library version 2.26
*/
# define TCACHE_MAX_BINS 64
# define TCACHE_SMALL_BINS 64
# define TCACHE_LARGE_BINS 12 /* Up to 4M chunks */
# define TCACHE_MAX_BINS (TCACHE_SMALL_BINS + TCACHE_LARGE_BINS)

typedef struct tcache_entry
{
Expand Down Expand Up @@ -51,7 +53,8 @@ struct ca_malloc_par
INTERNAL_SIZE_T max_total_mem;
char* sbrk_base;
/* per-thread cache */
size_t tcache_bins; /* Maximum number of buckets to use. */
size_t tcache_bins; /* Maximum number of buckets to use (removed in glibc 2.42) */
size_t tcache_small_bins; /* Maximum number of small buckets to use (glibc 2.42) */
size_t tcache_max_bytes;
size_t tcache_count; /* Maximum number of chunks in each bucket. */
/*
Expand Down Expand Up @@ -380,6 +383,11 @@ static bool heap_walk(address_t heapaddr, bool verbose)
CA_PRINT("\t\ttotal mmap regions created=%d\n", mparams.max_n_mmaps);
CA_PRINT("\t\tmmapped_mem=" PRINT_FORMAT_SIZE "\n", mparams.mmapped_mem);
CA_PRINT("\t\tsbrk_base=%p\n", mparams.sbrk_base);
CA_PRINT("\t\ttcache_bins=" PRINT_FORMAT_SIZE "\n", mparams.tcache_bins);
if (mparams.tcache_small_bins > 0)
CA_PRINT("\t\ttcache_small_bins=" PRINT_FORMAT_SIZE "\n", mparams.tcache_small_bins);
CA_PRINT("\t\ttcache_max_bytes=" PRINT_FORMAT_SIZE "\n", mparams.tcache_max_bytes);
CA_PRINT("\t\ttcache_count=" PRINT_FORMAT_SIZE "\n", mparams.tcache_count);

if (verbose)
init_mem_histogram(16);
Expand Down Expand Up @@ -684,7 +692,7 @@ static CoreAnalyzerHeapInterface sPtMallHeapManager = {
void register_pt_malloc_2_35() {
bool my_heap = false;
if (pt::get_glibc_version(&glibc_ver_major, &glibc_ver_minor)) {
if (glibc_ver_major == 2 && glibc_ver_minor >= 32 && glibc_ver_minor <= 41)
if (glibc_ver_major == 2 && glibc_ver_minor >= 32 && glibc_ver_minor <= 42)
my_heap = true;
}
return register_heap_manager("pt 2.32-2.37", &sPtMallHeapManager, my_heap);
Expand Down Expand Up @@ -945,50 +953,52 @@ compare_tcache_chunk(const void* lhs, const void* rhs)
return 0;
}

static int
thread_tcache (struct thread_info *info, void *data)
static bool extract_tcache(tcache_perthread_struct *tcps, struct symbol *tcsym)
{
struct symbol *tcsym;
struct value *val;
struct type *type;
tcache_perthread_struct tcps;
size_t valsz;
address_t addr;
unsigned int i;

switch_to_thread (info);

tcsym = lookup_symbol("tcache", nullptr, SEARCH_VAR_DOMAIN, nullptr).symbol;
if (tcsym == NULL) {
CA_PRINT("Failed to lookup thread-local variable \"tcache\"\n");
return false;
}
try
{
val = value_of_variable(tcsym, 0);
if (!val)
return false;

val = value_coerce_to_target(val);
type = val->type();
type = check_typedef(type->target_type());
valsz = type->length();
if (sizeof(tcps) != valsz)
{
CA_PRINT("Internal error: \"struct tcache_perthread_struct\" is incorrect\n");
CA_PRINT("Assumed tcache size=%ld while gdb sees size=%ld\n", sizeof(tcps), valsz);
val = value_ind(val);
if (!val)
return false;
}
addr = value_as_address(val);
}
catch (gdb_exception_error &e)
{
CA_PRINT("Failed to evaluate thread-local variable \"tcache\": %s\n", e.what());
return false;
}
//CA_PRINT("tcache for ptid.pid [%d]: 0x%lx\n", info->ptid.pid(), addr);
if (!read_memory_wrapper(NULL, addr, &tcps, valsz)) {
CA_PRINT("Failed to read thread-local variable \"tcache\"\n");

if (!ca_memcpy_field_value(val, "entries", (char *)&tcps->entries[0], sizeof(tcps->entries[0]) * mparams.tcache_bins)) {
CA_PRINT("Failed to extract tcache.entries from thread-local variable \"tcache\"\n");
return false;
}
return true;
}

static int
thread_tcache (struct thread_info *info, void *data)
{
struct symbol *tcsym;
tcache_perthread_struct tcps;
unsigned int i;

switch_to_thread (info);

tcsym = lookup_symbol("tcache", nullptr, SEARCH_VAR_DOMAIN, nullptr).symbol;
if (tcsym == NULL) {
CA_PRINT("Failed to lookup thread-local variable \"tcache\"\n");
return false;
} else if (!extract_tcache(&tcps, tcsym)) {
CA_PRINT("Failed to extract tcache from thread-local variable \"tcache\"\n");
return false;
}

/* Each entry is a singly-linked list */
for (i = 0; i < mparams.tcache_bins; i++) {
unsigned int count = 0;
Expand Down Expand Up @@ -1488,18 +1498,24 @@ read_mp_by_symbol(void)
return false;
mparams.sbrk_base = (char *)data;
/* per-thread cache since glibc 2.26 */
if (!ca_get_field_value(val, "tcache_bins", &data, true))
return false;
if (data != ULONG_MAX)
mparams.tcache_bins = data;
if (!ca_get_field_value(val, "tcache_max_bytes", &data, true))
if (!ca_get_field_value(val, "tcache_max_bytes", &data, false))
return false;
if (data != ULONG_MAX)
mparams.tcache_max_bytes = request2size(data);
if (!ca_get_field_value(val, "tcache_count", &data, true))
if (!ca_get_field_value(val, "tcache_count", &data, false))
return false;
if (data != ULONG_MAX)
mparams.tcache_count = data;
// pre glibc 2.42
if (ca_get_field_value(val, "tcache_bins", &data, true) && data != ULONG_MAX) {
mparams.tcache_small_bins = 0;
mparams.tcache_bins = data;
}
// glibc 2.42 and later
if (ca_get_field_value(val, "tcache_small_bins", &data, true) && data != ULONG_MAX) {
mparams.tcache_small_bins = data;
mparams.tcache_bins = TCACHE_MAX_BINS;
}

/* ptmalloc: static INTERNAL_SIZE_T global_max_fast; */
sym = lookup_symbol("global_max_fast", nullptr, SEARCH_VAR_DOMAIN, nullptr).symbol;
Expand Down
89 changes: 53 additions & 36 deletions src/heap_ptmalloc_2_35.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
/*
* Per-thread cache is added since GNU C Library version 2.26
*/
# define TCACHE_MAX_BINS 64
# define TCACHE_SMALL_BINS 64
# define TCACHE_LARGE_BINS 12 /* Up to 4M chunks */
# define TCACHE_MAX_BINS (TCACHE_SMALL_BINS + TCACHE_LARGE_BINS)

typedef struct tcache_entry
{
Expand Down Expand Up @@ -51,7 +53,8 @@ struct ca_malloc_par
INTERNAL_SIZE_T max_total_mem;
char* sbrk_base;
/* per-thread cache */
size_t tcache_bins; /* Maximum number of buckets to use. */
size_t tcache_bins; /* Maximum number of buckets to use (removed in glibc 2.42) */
size_t tcache_small_bins; /* Maximum number of small buckets to use (glibc 2.42) */
size_t tcache_max_bytes;
size_t tcache_count; /* Maximum number of chunks in each bucket. */
/*
Expand Down Expand Up @@ -380,6 +383,11 @@ static bool heap_walk(address_t heapaddr, bool verbose)
CA_PRINT("\t\ttotal mmap regions created=%d\n", mparams.max_n_mmaps);
CA_PRINT("\t\tmmapped_mem=" PRINT_FORMAT_SIZE "\n", mparams.mmapped_mem);
CA_PRINT("\t\tsbrk_base=%p\n", mparams.sbrk_base);
CA_PRINT("\t\ttcache_bins=" PRINT_FORMAT_SIZE "\n", mparams.tcache_bins);
if (mparams.tcache_small_bins > 0)
CA_PRINT("\t\ttcache_small_bins=" PRINT_FORMAT_SIZE "\n", mparams.tcache_small_bins);
CA_PRINT("\t\ttcache_max_bytes=" PRINT_FORMAT_SIZE "\n", mparams.tcache_max_bytes);
CA_PRINT("\t\ttcache_count=" PRINT_FORMAT_SIZE "\n", mparams.tcache_count);

if (verbose)
init_mem_histogram(16);
Expand Down Expand Up @@ -684,7 +692,7 @@ static CoreAnalyzerHeapInterface sPtMallHeapManager = {
void register_pt_malloc_2_35() {
bool my_heap = false;
if (pt::get_glibc_version(&glibc_ver_major, &glibc_ver_minor)) {
if (glibc_ver_major == 2 && glibc_ver_minor >= 32 && glibc_ver_minor <= 40)
if (glibc_ver_major == 2 && glibc_ver_minor >= 32 && glibc_ver_minor <= 42)
my_heap = true;
}
return register_heap_manager("pt 2.32-2.37", &sPtMallHeapManager, my_heap);
Expand Down Expand Up @@ -945,50 +953,53 @@ compare_tcache_chunk(const void* lhs, const void* rhs)
return 0;
}

static int
thread_tcache (struct thread_info *info, void *data)
static bool extract_tcache(tcache_perthread_struct *tcps, struct symbol *tcsym)
{
struct symbol *tcsym;
struct value *val;
struct type *type;
tcache_perthread_struct tcps;
size_t valsz;
address_t addr;
unsigned int i;

switch_to_thread (info);

tcsym = lookup_symbol("tcache", 0, VAR_DOMAIN, 0).symbol;
if (tcsym == NULL) {
CA_PRINT("Failed to lookup thread-local variable \"tcache\"\n");
return false;
}
try
{
val = value_of_variable(tcsym, 0);
if (!val)
return false;

val = value_coerce_to_target(val);
type = value_type(val);
type = check_typedef(TYPE_TARGET_TYPE(type));
valsz = TYPE_LENGTH(type);
if (sizeof(tcps) != valsz)
{
CA_PRINT("Internal error: \"struct tcache_perthread_struct\" is incorrect\n");
CA_PRINT("Assumed tcache size=%ld while gdb sees size=%ld\n", sizeof(tcps), valsz);
val = value_ind(val);
if (!val)
return false;
}
addr = value_as_address(val);
}
catch (gdb_exception_error &e)
{
CA_PRINT("Failed to evaluate thread-local variable \"tcache\": %s\n", e.what());
return false;
}
//CA_PRINT("tcache for ptid.pid [%d]: 0x%lx\n", info->ptid.pid(), addr);
if (!read_memory_wrapper(NULL, addr, &tcps, valsz)) {
CA_PRINT("Failed to read thread-local variable \"tcache\"\n");

if (!ca_memcpy_field_value(val, "entries", (char *)&tcps->entries[0], sizeof(tcps->entries[0]) * mparams.tcache_bins)) {
CA_PRINT("Failed to extract tcache.entries from thread-local variable \"tcache\"\n");
return false;
}
return true;
}

static int
thread_tcache (struct thread_info *info, void *data)
{
struct symbol *tcsym;
tcache_perthread_struct tcps;
unsigned int i;

switch_to_thread (info);

tcsym = lookup_symbol("tcache", 0, VAR_DOMAIN, 0).symbol;
if (tcsym == NULL) {
CA_PRINT("Failed to lookup thread-local variable \"tcache\"\n");
return false;
}
else if (!extract_tcache(&tcps, tcsym)) {
CA_PRINT("Failed to extract tcache from thread-local variable \"tcache\"\n");
return false;
}

/* Each entry is a singly-linked list */
for (i = 0; i < mparams.tcache_bins; i++) {
unsigned int count = 0;
Expand Down Expand Up @@ -1488,18 +1499,24 @@ read_mp_by_symbol(void)
return false;
mparams.sbrk_base = (char *)data;
/* per-thread cache since glibc 2.26 */
if (!ca_get_field_value(val, "tcache_bins", &data, true))
return false;
if (data != ULONG_MAX)
mparams.tcache_bins = data;
if (!ca_get_field_value(val, "tcache_max_bytes", &data, true))
if (!ca_get_field_value(val, "tcache_max_bytes", &data, false))
return false;
if (data != ULONG_MAX)
mparams.tcache_max_bytes = request2size(data);
if (!ca_get_field_value(val, "tcache_count", &data, true))
if (!ca_get_field_value(val, "tcache_count", &data, false))
return false;
if (data != ULONG_MAX)
mparams.tcache_count = data;
// pre glibc 2.42
if (ca_get_field_value(val, "tcache_bins", &data, true) && data != ULONG_MAX) {
mparams.tcache_small_bins = 0;
mparams.tcache_bins = data;
}
// glibc 2.42 and later
if (ca_get_field_value(val, "tcache_small_bins", &data, true) && data != ULONG_MAX) {
mparams.tcache_small_bins = data;
mparams.tcache_bins = TCACHE_MAX_BINS;
}

/* ptmalloc: static INTERNAL_SIZE_T global_max_fast; */
sym = lookup_symbol("global_max_fast", 0, VAR_DOMAIN, 0).symbol;
Expand Down
8 changes: 4 additions & 4 deletions test/regression.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -ex
# ubuntu:24.04, ubuntu:22.04, ubuntu:20.04
# debian:trixie(13), debian:bookworm(12) (debian:bullseye(11) fails for tcmalloc 2.16 due to gcc/g++ version)
# redhat/ubi10, redhat/ubi9 (redhat/ubi8 fails because tcache_entry is mangled, presumably for security reasons)
# fedora:42, fedora:41, fedora:40 (fedora:43 fails because of glibc 2.42, which is not supported by core_analyzer ptmalloc 2.35 parser)
# fedora:43, fedora:42, fedora:41
# opensuse/leap:16.0, opensuse/leap:15.6, opensuse/leap:15.5
#

Expand Down Expand Up @@ -55,13 +55,13 @@ docker build --build-arg VARIANT="redhat/ubi9" --build-arg GDB_VERSION="12.1" -t
# docker build --build-arg VARIANT="redhat/ubi8" --build-arg GDB_VERSION="12.1" -t ca_test -q -f test/DockerfileTest_redhat .

docker system prune -af > /dev/null
docker build --build-arg VARIANT="fedora:42" --build-arg GDB_VERSION="16.3" -t ca_test -q -f test/DockerfileTest_redhat .
docker build --build-arg VARIANT="fedora:43" --build-arg GDB_VERSION="16.3" -t ca_test -q -f test/DockerfileTest_redhat .

docker system prune -af > /dev/null
docker build --build-arg VARIANT="fedora:41" --build-arg GDB_VERSION="16.3" -t ca_test -q -f test/DockerfileTest_redhat .
docker build --build-arg VARIANT="fedora:42" --build-arg GDB_VERSION="16.3" -t ca_test -q -f test/DockerfileTest_redhat .

docker system prune -af > /dev/null
docker build --build-arg VARIANT="fedora:40" --build-arg GDB_VERSION="16.3" -t ca_test -q -f test/DockerfileTest_redhat .
docker build --build-arg VARIANT="fedora:41" --build-arg GDB_VERSION="16.3" -t ca_test -q -f test/DockerfileTest_redhat .

#docker system prune -af > /dev/null
#docker build --build-arg VARIANT="opensuse/tumbleweed" --build-arg GDB_VERSION="12.1" -t ca_test -q -f test/DockerfileTest_suse .
Expand Down
Loading