Skip to content

Commit 29ff6ad

Browse files
committed
Revert change made to use var_count as it seems it doesn't work for classes
1 parent db081bf commit 29ff6ad

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

examples/cpp/pyperf/PyPerfBPFProgram.cc

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -552,15 +552,10 @@ get_first_arg_name(
552552
//
553553
// ((PyTupleObject*)$frame->f_code->co_varnames)->ob_item[0]
554554
//
555-
int var_count;
556-
result |= bpf_probe_read_user(&var_count, sizeof(var_count), code_ptr + 72); // co_nlocalsplus
557-
558555
void* args_ptr;
559-
if (result == 0 && var_count > 0) {
560-
result |= bpf_probe_read_user(&args_ptr, sizeof(void*), code_ptr + offsets->PyCodeObject.co_varnames);
561-
result |= bpf_probe_read_user(&ob_size, sizeof(ob_size), args_ptr + 16); // PyVarObject.ob_size has always been 16
562-
}
563-
556+
result |= bpf_probe_read_user(&args_ptr, sizeof(void*), code_ptr + offsets->PyCodeObject.co_varnames);
557+
result |= bpf_probe_read_user(&ob_size, sizeof(ob_size), args_ptr + 16); // PyVarObject.ob_size has always been 16
558+
564559
if (result == 0 && ob_size > 0) {
565560
result |= bpf_probe_read_user(&args_ptr, sizeof(void*), args_ptr + offsets->PyTupleObject.ob_item);
566561
result |= bpf_probe_read_user_str(argname, maxlen, args_ptr + offsets->String.data);

0 commit comments

Comments
 (0)