From patchwork Thu Jun 30 14:09:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 13517 Received: (qmail 59209 invoked by alias); 30 Jun 2016 14:09:47 -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 59131 invoked by uid 89); 30 Jun 2016 14:09:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:remove_, sk:insert_, UD:id X-HELO: mail-pa0-f68.google.com Received: from mail-pa0-f68.google.com (HELO mail-pa0-f68.google.com) (209.85.220.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 30 Jun 2016 14:09:37 +0000 Received: by mail-pa0-f68.google.com with SMTP id ts6so7309194pac.0 for ; Thu, 30 Jun 2016 07:09:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=mC6+9ywuRoXaNVics0bbsIQoy3Jvb40qx9++TLNfWB0=; b=kRiVtqpMVh4IGpGFJEJI9woCwgofrb5xyy9l1GHaWtCHw0DN9R2sLJxNvVtRpOKFh8 IJelLX2BucEqJEy2W6kJUAzI1fdyEnytTot2QknqKcpWRnKTp28F/Zt1aSGobzSNJbR0 Y1fM75r02WA6jEIDedbTn/HqrfoQwNkMZv18CNlsOgf9xKLmgyYYsfDmSz2aDYMJ/Gwg lfI+smtrir053d4A2y3EtR6gUy9g8K35+Ver8E4rkTlgNspqBmZ2CnZ9EGEwGA5N4YPp 9QfCMicN+tYLdDDAnfCTD4Q2Gc/urwreToQ9lrjWTAiM752CaEWHKPTDWm8mWMojuvMH ks2w== X-Gm-Message-State: ALyK8tLHgN0QuWT77yzUE0fG6KKRBFBcDXMrfFnOVq+MC2TlE9aazOwJXGn6x6A1DOwPRg== X-Received: by 10.66.25.133 with SMTP id c5mr21885860pag.103.1467295775761; Thu, 30 Jun 2016 07:09:35 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id s3sm6263184pfb.87.2016.06.30.07.09.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Jun 2016 07:09:35 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 3/9] Refactor clone_all_breakpoints Date: Thu, 30 Jun 2016 15:09:19 +0100 Message-Id: <1467295765-3457-4-git-send-email-yao.qi@linaro.org> In-Reply-To: <1467295765-3457-1-git-send-email-yao.qi@linaro.org> References: <1467295765-3457-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes V3: Make parent_thread be const, and make get_thread_process parameter const too, V2: pass parent thread instead of parent process to clone_all_breakpoints, This patch is to change the interface of clone_all_breakpoints, from lists of breakpoints and raw_breakpoints to child thread and parent thread. I choose child thread to pass because we need the ptid of the child thread in the following patch. gdb/gdbserver: 2016-06-17 Yao Qi * inferiors.c (get_thread_process): Make parameter const. * inferiors.h (get_thread_process): Update declaration. * mem-break.c (clone_all_breakpoints): Remove all parameters. Add new parameters child_thread and parent_thread. Callers updated. * mem-break.h (clone_all_breakpoints): Update declaration. --- gdb/gdbserver/ChangeLog | 9 +++++++++ gdb/gdbserver/inferiors.c | 2 +- gdb/gdbserver/inferiors.h | 2 +- gdb/gdbserver/linux-low.c | 4 +--- gdb/gdbserver/mem-break.c | 15 ++++++++------- gdb/gdbserver/mem-break.h | 8 ++++---- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index a59d4e5..81c7c74 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -47,6 +47,15 @@ 2016-06-17 Yao Qi + * inferiors.c (get_thread_process): Make parameter const. + * inferiors.h (get_thread_process): Update declaration. + * mem-break.c (clone_all_breakpoints): Remove all parameters. + Add new parameters child_thread and parent_thread. Callers + updated. + * mem-break.h (clone_all_breakpoints): Update declaration. + +2016-06-17 Yao Qi + * mem-break.c (struct breakpoint) : Remove. : Remove. (struct gdb_breakpoint): New. diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 4bea4fd..1f5149f 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -399,7 +399,7 @@ have_attached_inferiors_p (void) } struct process_info * -get_thread_process (struct thread_info *thread) +get_thread_process (const struct thread_info *thread) { int pid = ptid_get_pid (thread->entry.id); return find_process_pid (pid); diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h index 00dfe60..65ab1c6 100644 --- a/gdb/gdbserver/inferiors.h +++ b/gdb/gdbserver/inferiors.h @@ -88,7 +88,7 @@ struct process_info no current thread selected. */ struct process_info *current_process (void); -struct process_info *get_thread_process (struct thread_info *); +struct process_info *get_thread_process (const struct thread_info *); extern struct inferior_list all_processes; diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 0f4bb87..74dbb9a 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -559,9 +559,7 @@ handle_extended_wait (struct lwp_info **orig_event_lwp, int wstat) current_thread = saved_thread; } - clone_all_breakpoints (&child_proc->breakpoints, - &child_proc->raw_breakpoints, - parent_proc->breakpoints); + clone_all_breakpoints (child_thr, event_thr); tdesc = XNEW (struct target_desc); copy_target_description (tdesc, parent_proc->tdesc); diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c index 3539422..c14219e 100644 --- a/gdb/gdbserver/mem-break.c +++ b/gdb/gdbserver/mem-break.c @@ -2184,21 +2184,22 @@ clone_one_breakpoint (const struct breakpoint *src) return dest; } -/* Create a new breakpoint list NEW_LIST that is a copy of the - list starting at SRC_LIST. Create the corresponding new - raw_breakpoint list NEW_RAW_LIST as well. */ +/* See mem-break.h. */ void -clone_all_breakpoints (struct breakpoint **new_list, - struct raw_breakpoint **new_raw_list, - const struct breakpoint *src_list) +clone_all_breakpoints (struct thread_info *child_thread, + const struct thread_info *parent_thread) { const struct breakpoint *bp; struct breakpoint *new_bkpt; struct breakpoint *bkpt_tail = NULL; struct raw_breakpoint *raw_bkpt_tail = NULL; + struct process_info *child_proc = get_thread_process (child_thread); + struct process_info *parent_proc = get_thread_process (parent_thread); + struct breakpoint **new_list = &child_proc->breakpoints; + struct raw_breakpoint **new_raw_list = &child_proc->raw_breakpoints; - for (bp = src_list; bp != NULL; bp = bp->next) + for (bp = parent_proc->breakpoints; bp != NULL; bp = bp->next) { new_bkpt = clone_one_breakpoint (bp); APPEND_TO_LIST (new_list, new_bkpt, bkpt_tail); diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h index 321de12..d633003 100644 --- a/gdb/gdbserver/mem-break.h +++ b/gdb/gdbserver/mem-break.h @@ -267,10 +267,10 @@ int insert_memory_breakpoint (struct raw_breakpoint *bp); int remove_memory_breakpoint (struct raw_breakpoint *bp); -/* Create a new breakpoint list NEW_BKPT_LIST that is a copy of SRC. */ +/* Create a new breakpoint list in CHILD_THREAD's process that is a + copy of breakpoint list in PARENT_THREAD's process. */ -void clone_all_breakpoints (struct breakpoint **new_bkpt_list, - struct raw_breakpoint **new_raw_bkpt_list, - const struct breakpoint *src); +void clone_all_breakpoints (struct thread_info *child_thread, + const struct thread_info *parent_thread); #endif /* MEM_BREAK_H */