diff options
| author | Pedro Alves <palves@redhat.com> | 2014-06-19 11:59:03 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2014-06-19 11:59:03 +0100 |
| commit | 034f788c5ec1e5b20fae3b6efc7fe961631e014d (patch) | |
| tree | 039c2ea366839afb8a82d98df115b5c60f8ad80d /gdb/infrun.c | |
| parent | 46e3325277e604face2848eec78247826b94d5c9 (diff) | |
| download | gdb-034f788c5ec1e5b20fae3b6efc7fe961631e014d.zip gdb-034f788c5ec1e5b20fae3b6efc7fe961631e014d.tar.gz gdb-034f788c5ec1e5b20fae3b6efc7fe961631e014d.tar.bz2 | |
Fix next over threaded execl with "set scheduler-locking step".
Running gdb.threads/thread-execl.exp with scheduler-locking set to
"step" reveals a problem:
(gdb) next^M
[Thread 0x7ffff7fda700 (LWP 27168) exited]^M
[New LWP 27168]^M
[Thread 0x7ffff74ee700 (LWP 27174) exited]^M
process 27168 is executing new program: /home/jkratoch/redhat/gdb-clean/gdb/testsuite/gdb.threads/thread-execl^M
[Thread debugging using libthread_db enabled]^M
Using host libthread_db library "/lib64/libthread_db.so.1".^M
infrun.c:5225: internal-error: switch_back_to_stepped_thread: Assertion `!schedlock_applies (1)' failed.^M
A problem internal to GDB has been detected,^M
further debugging may prove unreliable.^M
Quit this debugging session? (y or n) FAIL: gdb.threads/thread-execl.exp: schedlock step: get to main in new image (GDB internal error)
The assertion is correct. The issue is that GDB is mistakenly trying
to switch back to an exited thread, that was previously stepping when
it exited. This is exactly the sort of thing the test wants to make
sure doesn't happen:
# Now set a breakpoint at `main', and step over the execl call. The
# breakpoint at main should be reached. GDB should not try to revert
# back to the old thread from the old image and resume stepping it
We don't see this bug with schedlock off only because a different
sequence of events makes GDB manage to delete the thread instead of
marking it exited.
This particular internal error can be fixed by making the loop over
all threads in switch_back_to_stepped_thread skip exited threads.
But, looking over other ALL_THREADS users, all either can or should be
skipping exited threads too. So for simplicity, this patch replaces
ALL_THREADS with a new macro that skips exited threads itself, and
updates everything to use it.
Tested on x86_64 Fedora 20.
gdb/
2014-06-19 Pedro Alves <palves@redhat.com>
* gdbthread.h (ALL_THREADS): Delete.
(ALL_NON_EXITED_THREADS): New macro.
* btrace.c (btrace_free_objfile): Use ALL_NON_EXITED_THREADS
instead of ALL_THREADS.
* infrun.c (find_thread_needs_step_over)
(switch_back_to_stepped_thread): Use ALL_NON_EXITED_THREADS
instead of ALL_THREADS.
* record-btrace.c (record_btrace_open)
(record_btrace_stop_recording, record_btrace_close)
(record_btrace_is_replaying, record_btrace_resume)
(record_btrace_find_thread_to_move, record_btrace_wait): Likewise.
* remote.c (append_pending_thread_resumptions): Likewise.
* thread.c (thread_apply_all_command): Likewise.
gdb/testsuite/
2014-06-19 Pedro Alves <palves@redhat.com>
* gdb.threads/thread-execl.exp (do_test): New procedure, factored
out from ...
(top level): ... here. Iterate running tests under different
scheduler-locking settings.
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 2be2e5e..bef69a8 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2160,7 +2160,7 @@ find_thread_needs_step_over (int step, struct thread_info *except) return NULL; } - ALL_THREADS (tp) + ALL_NON_EXITED_THREADS (tp) { /* Ignore the EXCEPT thread. */ if (tp == except) @@ -5204,7 +5204,7 @@ switch_back_to_stepped_thread (struct execution_control_state *ecs) step/next/etc. */ stepping_thread = NULL; step_over = NULL; - ALL_THREADS (tp) + ALL_NON_EXITED_THREADS (tp) { /* Ignore threads of processes we're not resuming. */ if (!sched_multi |