Skip to content

[COD-3196] fix(callgrind): represent os threads under --separate-threads=yes #24

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
GuillaumeLagrange merged 2 commits into from
Jul 30, 2026
Merged

[COD-3196] fix(callgrind): represent os threads under --separate-threads=yes #24

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
b19e730
fix(callgrind): represent os threads under --separate-threads=yes
GuillaumeLagrange Jul 21, 2026
8a969c4
fix(callgrind): seed every live thread at instrumentation start
GuillaumeLagrange Jul 29, 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
12 changes: 6 additions & 6 deletions callgrind/bbcc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ BBCC* lookup_bbcc(BB* bb, Context* cxt)
/* if we don't dump threads separate, tid doesn't have to match */
return bbcc;
}
if (bbcc->tid == CLG_(current_tid)) return bbcc;
if (bbcc->tid == CLG_(current_thread_serial)) return bbcc;
}

CLG_(stat).bbcc_lru_misses++;
Expand All @@ -179,7 +179,7 @@ BBCC* lookup_bbcc(BB* bb, Context* cxt)
}

CLG_DEBUG(2," lookup_bbcc(BB %#lx, Cxt %u, fn '%s'): %p (tid %u)\n",
bb_addr(bb), cxt->base_number, cxt->fn[0]->name,
bb_addr(bb), cxt->base_number, cxt->fn[0]->name,
bbcc, bbcc ? bbcc->tid : 0);

CLG_DEBUGIF(2)
Expand Down Expand Up @@ -274,7 +274,7 @@ BBCC* new_bbcc(BB* bb)
sizeof(BBCC) +
(bb->cjmp_count+1) * sizeof(JmpData));
bbcc->bb = bb;
bbcc->tid = CLG_(current_tid);
bbcc->tid = CLG_(current_thread_serial);

bbcc->ret_counter = 0;
bbcc->skipped = 0;
Expand Down Expand Up @@ -381,8 +381,8 @@ static BBCC* clone_bbcc(BBCC* orig, Context* cxt, Int rec_index)

if (rec_index == 0) {

/* hash insertion is only allowed if tid or cxt is different */
CLG_ASSERT((orig->tid != CLG_(current_tid)) ||
/* hash insertion is only allowed if thread or cxt is different */
CLG_ASSERT((orig->tid != CLG_(current_thread_serial)) ||
(orig->cxt != cxt));

bbcc->rec_index = 0;
Expand All @@ -394,7 +394,7 @@ static BBCC* clone_bbcc(BBCC* orig, Context* cxt, Int rec_index)
}
else {
if (CLG_(clo).separate_threads)
CLG_ASSERT(orig->tid == CLG_(current_tid));
CLG_ASSERT(orig->tid == CLG_(current_thread_serial));

CLG_ASSERT(orig->cxt == cxt);
CLG_ASSERT(orig->rec_array);
Expand Down
50 changes: 46 additions & 4 deletions callgrind/callstack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include "global.h"
#include "pub_tool_stacktrace.h"