From patchwork Thu Oct 9 09:52:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 3160 Received: (qmail 14308 invoked by alias); 9 Oct 2014 10:18:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 14230 invoked by uid 89); 9 Oct 2014 10:18:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 09 Oct 2014 10:18:16 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s999qrAR013514 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 9 Oct 2014 05:52:53 -0400 Received: from blade.nx (ovpn-116-100.ams2.redhat.com [10.36.116.100]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s999qpFx004096 for ; Thu, 9 Oct 2014 05:52:52 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 6C2202626C5 for ; Thu, 9 Oct 2014 10:52:48 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 03/13 v2] Add iterate_over_lwps to gdbserver Date: Thu, 9 Oct 2014 10:52:28 +0100 Message-Id: <1412848358-9958-4-git-send-email-gbenson@redhat.com> In-Reply-To: <1412848358-9958-1-git-send-email-gbenson@redhat.com> References: <1412848358-9958-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit introduces a new function, iterate_over_lwps, that shared Linux code can use to call a function for each LWP that matches certain criteria. This function already existed in GDB and was in use by GDB's various low-level Linux x86 debug register setters. An equivalent was written for gdbserver and gdbserver's low-level Linux x86 debug register setters were modified to use it. gdb/ChangeLog: * linux-nat.h: Include nat/linux-nat.h. (iterate_over_lwps): Move declaration to nat/linux-nat.h. * nat/linux-nat.h (struct lwp_info): New forward declaration. (iterate_over_lwps_ftype): New typedef. (iterate_over_lwps): New declaration. * linux-nat.h (iterate_over_lwps): Update comment. Use iterate_over_lwps_ftype. Update callback return value check. gdb/gdbserver/ChangeLog: * linux-low.h: Include nat/linux-nat.h. * linux-low.c (iterate_over_lwps_args): New structure. (iterate_over_lwps_filter): New function. (iterate_over_lwps): Likewise. * linux-x86-low.c (update_debug_registers_callback): Updated signature to what iterate_over_lwps expects. Remove PID check that iterate_over_lwps now performs. (x86_dr_low_set_addr): Use iterate_over_lwps. (x86_dr_low_set_control): Likewise. --- gdb/ChangeLog | 10 +++++++ gdb/gdbserver/ChangeLog | 12 +++++++++ gdb/gdbserver/linux-low.c | 54 +++++++++++++++++++++++++++++++++++++++++ gdb/gdbserver/linux-low.h | 1 + gdb/gdbserver/linux-x86-low.c | 33 +++++++++---------------- gdb/linux-nat.c | 9 ++---- gdb/linux-nat.h | 8 +----- gdb/nat/linux-nat.h | 15 +++++++++++ 8 files changed, 108 insertions(+), 34 deletions(-) diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 6e1ed8a..c980d10 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -1304,6 +1304,60 @@ num_lwps (int pid) return count; } +/* The arguments passed to iterate_over_lwps. */ + +struct iterate_over_lwps_args +{ + /* The FILTER argument passed to iterate_over_lwps. */ + ptid_t filter; + + /* The CALLBACK argument passed to iterate_over_lwps. */ + iterate_over_lwps_ftype *callback; + + /* The DATA argument passed to iterate_over_lwps. */ + void *data; +}; + +/* Callback for find_inferior used by iterate_over_lwps to filter + calls to the callback supplied to that function. Returning a + nonzero value causes find_inferiors to stop iterating and return + the current inferior_list_entry. Returning zero indicates that + find_inferiors should continue iterating. */ + +static int +iterate_over_lwps_filter (struct inferior_list_entry *entry, void *args_p) +{ + struct iterate_over_lwps_args *args + = (struct iterate_over_lwps_args *) args_p; + + if (ptid_match (entry->id, args->filter)) + { + struct thread_info *thr = (struct thread_info *) entry; + struct lwp_info *lwp = get_thread_lwp (thr); + + return (*args->callback) (lwp, args->data); + } + + return 0; +} + +/* See nat/linux-nat.h. */ + +struct lwp_info * +iterate_over_lwps (ptid_t filter, + iterate_over_lwps_ftype callback, + void *data) +{ + struct iterate_over_lwps_args args = {filter, callback, data}; + struct inferior_list_entry *entry; + + entry = find_inferior (&all_threads, iterate_over_lwps_filter, &args); + if (entry == NULL) + return NULL; + + return get_thread_lwp ((struct thread_info *) entry); +} + /* Detect zombie thread group leaders, and "exit" them. We can't reap their exits until all other threads in the group have exited. */ diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h index 4820929..11d73f3 100644 --- a/gdb/gdbserver/linux-low.h +++ b/gdb/gdbserver/linux-low.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "nat/linux-nat.h" #include "nat/gdb_thread_db.h" #include diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index e8c6a9c..a861872 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -562,25 +562,16 @@ x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) } static int -update_debug_registers_callback (struct inferior_list_entry *entry, - void *pid_p) +update_debug_registers_callback (struct lwp_info *lwp, void *arg) { - struct thread_info *thr = (struct thread_info *) entry; - struct lwp_info *lwp = get_thread_lwp (thr); - int pid = *(int *) pid_p; + /* The actual update is done later just before resuming the lwp, + we just mark that the registers need updating. */ + lwp->arch_private->debug_registers_changed = 1; - /* Only update the threads of this process. */ - if (pid_of (thr) == pid) - { - /* The actual update is done later just before resuming the lwp, - we just mark that the registers need updating. */ - lwp->arch_private->debug_registers_changed = 1; - - /* If the lwp isn't stopped, force it to momentarily pause, so - we can update its debug registers. */ - if (!lwp->stopped) - linux_stop_lwp (lwp); - } + /* If the lwp isn't stopped, force it to momentarily pause, so + we can update its debug registers. */ + if (!lwp->stopped) + linux_stop_lwp (lwp); return 0; } @@ -591,11 +582,11 @@ static void x86_dr_low_set_addr (int regnum, CORE_ADDR addr) { /* Only update the threads of this process. */ - int pid = pid_of (current_thread); + ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (current_lwp_ptid ())); gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); - find_inferior (&all_threads, update_debug_registers_callback, &pid); + iterate_over_lwps (pid_ptid, update_debug_registers_callback, NULL); } /* Return the inferior's debug register REGNUM. */ @@ -614,9 +605,9 @@ static void x86_dr_low_set_control (unsigned long control) { /* Only update the threads of this process. */ - int pid = pid_of (current_thread); + ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (current_lwp_ptid ())); - find_inferior (&all_threads, update_debug_registers_callback, &pid); + iterate_over_lwps (pid_ptid, update_debug_registers_callback, NULL); } /* Return the inferior's DR7 debug control register. */ diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 7d84589..1353d43 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -828,14 +828,11 @@ find_lwp_pid (ptid_t ptid) return NULL; } -/* Call CALLBACK with its second argument set to DATA for every LWP in - the list. If CALLBACK returns 1 for a particular LWP, return a - pointer to the structure describing that LWP immediately. - Otherwise return NULL. */ +/* See nat/linux-nat.h. */ struct lwp_info * iterate_over_lwps (ptid_t filter, - int (*callback) (struct lwp_info *, void *), + iterate_over_lwps_ftype callback, void *data) { struct lwp_info *lp, *lpnext; @@ -846,7 +843,7 @@ iterate_over_lwps (ptid_t filter, if (ptid_match (lp->ptid, filter)) { - if ((*callback) (lp, data)) + if ((*callback) (lp, data) != 0) return lp; } } diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h index 0aa8377..0195c5a 100644 --- a/gdb/linux-nat.h +++ b/gdb/linux-nat.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "nat/linux-nat.h" #include "target.h" - #include struct arch_lwp_info; @@ -126,12 +126,6 @@ extern int lin_lwp_attach_lwp (ptid_t ptid); extern void linux_stop_lwp (struct lwp_info *lwp); -/* Iterator function for lin-lwp's lwp list. */ -struct lwp_info *iterate_over_lwps (ptid_t filter, - int (*callback) (struct lwp_info *, - void *), - void *data); - /* Create a prototype generic GNU/Linux target. The client can override it with local methods. */ struct target_ops * linux_target (void); diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h index 71d4ee8..a2a0a98 100644 --- a/gdb/nat/linux-nat.h +++ b/gdb/nat/linux-nat.h @@ -20,6 +20,8 @@ #ifndef LINUX_NAT_H #define LINUX_NAT_H +struct lwp_info; + /* Unlike other extended result codes, WSTOPSIG (status) on PTRACE_O_TRACESYSGOOD syscall events doesn't return SIGTRAP, but instead SIGTRAP with bit 7 set. */ @@ -30,4 +32,17 @@ extern ptid_t current_lwp_ptid (void); +/* Function type for the CALLBACK argument of iterate_over_lwps. */ +typedef int (iterate_over_lwps_ftype) (struct lwp_info *lwp, void *arg); + +/* Iterate over all LWPs. Calls CALLBACK with its second argument set + to DATA for every LWP in the list. If CALLBACK returns nonzero for + a particular LWP, return a pointer to the structure describing that + LWP immediately. Otherwise return NULL. This function must be + provided by the client. */ + +extern struct lwp_info *iterate_over_lwps (ptid_t filter, + iterate_over_lwps_ftype callback, + void *data); + #endif /* LINUX_NAT_H */