From f72429c5cc268535be510b223a732c31816a79f9 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 3 Jan 2012 02:26:52 +0000 Subject: gdb/gdbserver/ * tracepoint.c (tracepoint_was_hit): Don't collect for static tracepoint. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/tracepoint.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'gdb') diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 207c715..9a69fa2 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2012-01-03 Yao Qi + + * tracepoint.c (tracepoint_was_hit): Don't collect for + static tracepoint. + 2012-01-02 Joel Brobecker * terminal.h: Reformat copyright header. diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index fa4c317..524fa77 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -4268,8 +4268,12 @@ tracepoint_was_hit (struct thread_info *tinfo, CORE_ADDR stop_pc) { /* Note that we collect fast tracepoints here as well. We'll step over the fast tracepoint jump later, which avoids the - double collect. */ - if (tpoint->enabled && stop_pc == tpoint->address) + double collect. However, we don't collect for static + tracepoints here, because UST markers are compiled in program, + and probes will be executed in program. So static tracepoints + are collected there. */ + if (tpoint->enabled && stop_pc == tpoint->address + && tpoint->type != static_tracepoint) { trace_debug ("Thread %s at address of tracepoint %d at 0x%s", target_pid_to_str (tinfo->entry.id), -- cgit v1.1