From 4281b351bfa3b646ab531cf73c56e49366fef108 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 21 Jul 2016 12:12:18 +0100 Subject: [PATCH] Use enqueue_pending_signal in linux_resume_one_thread gdb/gdbserver: 2016-07-21 Yao Qi * linux-low.c (linux_resume_one_thread): Call enqueue_pending_signal. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-low.c | 20 +++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 867a5a29f2f..3130334dd7c 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2016-07-21 Yao Qi + + * linux-low.c (linux_resume_one_thread): Call + enqueue_pending_signal. + 2016-07-21 Yao Qi * gdbthread.h (make_cleanup_restore_current_thread): Declare. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 9c675a42611..c8d0266e465 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -4995,21 +4995,19 @@ linux_resume_one_thread (struct inferior_list_entry *entry, void *arg) /* If we have a new signal, enqueue the signal. */ if (lwp->resume->sig != 0) { - struct pending_signals *p_sig = XCNEW (struct pending_signals); - - p_sig->prev = lwp->pending_signals; - p_sig->signal = lwp->resume->sig; + siginfo_t info, *info_p; /* If this is the same signal we were previously stopped by, - make sure to queue its siginfo. We can ignore the return - value of ptrace; if it fails, we'll skip - PTRACE_SETSIGINFO. */ + make sure to queue its siginfo. */ if (WIFSTOPPED (lwp->last_status) - && WSTOPSIG (lwp->last_status) == lwp->resume->sig) - ptrace (PTRACE_GETSIGINFO, lwpid_of (thread), (PTRACE_TYPE_ARG3) 0, - &p_sig->info); + && WSTOPSIG (lwp->last_status) == lwp->resume->sig + && ptrace (PTRACE_GETSIGINFO, lwpid_of (thread), + (PTRACE_TYPE_ARG3) 0, &info) == 0) + info_p = &info; + else + info_p = NULL; - lwp->pending_signals = p_sig; + enqueue_pending_signal (lwp, lwp->resume->sig, info_p); } } -- 2.30.2