diff options
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 5 | ||||
-rw-r--r-- | gdb/breakpoint.c | 10 | ||||
-rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.ada/tasks.exp | 28 |
4 files changed, 41 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 16f4619..3a02a49 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-02-26 Pedro Alves <palves@redhat.com> + + * breakpoint.c (bpstat_check_breakpoint_conditions): Handle + task-specific breakpoints. + 2014-02-25 Pedro Alves <palves@redhat.com> * ia64-linux-nat.c (ia64_linux_xfer_partial): Reimplement diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ef81443..45c3417 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -5159,7 +5159,6 @@ bpstat_check_watchpoint (bpstat bs) static void bpstat_check_breakpoint_conditions (bpstat bs, ptid_t ptid) { - int thread_id = pid_to_thread_id (ptid); const struct bp_location *bl; struct breakpoint *b; int value_is_zero = 0; @@ -5184,9 +5183,12 @@ bpstat_check_breakpoint_conditions (bpstat bs, ptid_t ptid) return; } - /* If this is a thread-specific breakpoint, don't waste cpu evaluating the - condition if this isn't the specified thread. */ - if (b->thread != -1 && b->thread != thread_id) + /* If this is a thread/task-specific breakpoint, don't waste cpu + evaluating the condition if this isn't the specified + thread/task. */ + if ((b->thread != -1 && b->thread != pid_to_thread_id (ptid)) + || (b->task != 0 && b->task != ada_get_task_number (ptid))) + { bs->stop = 0; return; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d54ed98..09cc8a3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-02-26 Pedro Alves <palves@redhat.com> + + * gdb.ada/tasks.exp: Set a task-specific breakpoint at break_me + that won't ever trigger. Make sure that GDB reports the correct + breakpoint that caused the stop. + 2014-02-25 Jan Kratochvil <jan.kratochvil@redhat.com> PR gdb/16626 diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp index 710deb0..088be6d 100644 --- a/gdb/testsuite/gdb.ada/tasks.exp +++ b/gdb/testsuite/gdb.ada/tasks.exp @@ -37,15 +37,35 @@ gdb_test "info tasks" \ "\r\n"] \ "info tasks before inserting breakpoint" -# Now, insert a breakpoint that should stop only if task 3 stops. -gdb_test "break break_me task 3" "Breakpoint .* at .*" +# Insert a breakpoint that should stop only if task 1 stops. Since +# task 1 never calls break_me, this shouldn't actually ever trigger. +# The fact that this breakpoint is created _before_ the next one +# matters. GDB used to have a bug where it would report the first +# breakpoint in the list that matched the triggered-breakpoint's +# address, no matter which task it was specific to. +gdb_test "break break_me task 1" "Breakpoint .* at .*" + +# Now, insert a breakpoint that should stop only if task 3 stops, and +# extract its number. +set bp_number -1 +set test "break break_me task 3" +gdb_test_multiple $test $test { + -re "Breakpoint (.*) at .*$gdb_prompt $" { + set bp_number $expect_out(1,string) + pass $test + } +} + +if {$bp_number < 0} { + return +} # Continue to that breakpoint. Task 2 should hit it first, and GDB # is expected to ignore that hit and resume the execution. Only then # task 3 will hit our breakpoint, and GDB is expected to stop at that -# point. +# point. Also make sure that GDB reports the correct breakpoint number. gdb_test "continue" \ - ".*Breakpoint.*, foo.break_me \\(\\).*" \ + ".*Breakpoint $bp_number, foo.break_me \\(\\).*" \ "continue to breakpoint" # Check that it is indeed task 3 that hit the breakpoint by checking |