[PATCH 3/9] Refactor clone_all_breakpoints

Yao Qi
2016-06-30T14:09:47Z

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 <yao.qi@linaro.org>

* 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 <yao.qi@linaro.org>

+ * 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 <yao.qi@linaro.org>
+
* mem-break.c (struct breakpoint) <cond_list>: Remove.
<command_list, handler>: 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 */
--
1.9.1