From 1a48f0027d52f507da1817406279c1b81a6fa262 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 23 Feb 2021 10:56:56 -0500 Subject: [PATCH] gdbserver: linux-low: make linux_process_target::filter_event return void Same as the previous patch, but for GDBserver. The return value of this method is never used, change it to return void. gdbserver/ChangeLog: * linux-low.cc (linux_process_target::filter_event): Return void. * linux-low.h (class linux_process_target) : Return void. Change-Id: I79e5dc04d9b21b9f01c6d675fa463d1b1a703b3a --- gdbserver/ChangeLog | 7 +++++++ gdbserver/linux-low.cc | 20 ++++++++++---------- gdbserver/linux-low.h | 8 ++++---- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 0c93ae0c086..0e713cc6abb 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2021-02-23 Simon Marchi + + * linux-low.cc (linux_process_target::filter_event): Return + void. + * linux-low.h (class linux_process_target) : + Return void. + 2021-02-12 Tom Tromey * gdbreplay.cc (remote_desc): Remove. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index cc19581c53d..0baac013129 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -2243,7 +2243,7 @@ linux_low_ptrace_options (int attached) return options; } -lwp_info * +void linux_process_target::filter_event (int lwpid, int wstat) { client_state &cs = get_client_state (); @@ -2292,10 +2292,10 @@ linux_process_target::filter_event (int lwpid, int wstat) if (child == NULL && WIFSTOPPED (wstat)) { add_to_pid_list (&stopped_pids, lwpid, wstat); - return NULL; + return; } else if (child == NULL) - return NULL; + return; thread = get_lwp_thread (child); @@ -2325,12 +2325,12 @@ linux_process_target::filter_event (int lwpid, int wstat) report this one right now. Leave the status pending for the next time we're able to report it. */ mark_lwp_dead (child, wstat); - return child; + return; } else { delete_lwp (child); - return NULL; + return; } } @@ -2358,7 +2358,7 @@ linux_process_target::filter_event (int lwpid, int wstat) the first instruction. */ child->status_pending_p = 1; child->status_pending = wstat; - return child; + return; } } } @@ -2397,7 +2397,7 @@ linux_process_target::filter_event (int lwpid, int wstat) { /* The event has been handled, so just return without reporting it. */ - return NULL; + return; } } @@ -2433,7 +2433,7 @@ linux_process_target::filter_event (int lwpid, int wstat) debug_printf ("LLW: SIGSTOP caught for %s " "while stopping threads.\n", target_pid_to_str (ptid_of (thread))); - return NULL; + return; } else { @@ -2444,13 +2444,13 @@ linux_process_target::filter_event (int lwpid, int wstat) target_pid_to_str (ptid_of (thread))); resume_one_lwp (child, child->stepping, 0, NULL); - return NULL; + return; } } child->status_pending_p = 1; child->status_pending = wstat; - return child; + return; } bool diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 0234df53358..be97526ced7 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -326,10 +326,10 @@ private: to a new LWP representing the new program. */ int handle_extended_wait (lwp_info **orig_event_lwp, int wstat); - /* Do low-level handling of the event, and check if we should go on - and pass it to caller code. Return the affected lwp if we are, or - NULL otherwise. */ - lwp_info *filter_event (int lwpid, int wstat); + /* Do low-level handling of the event, and check if this is an event we want + to report. Is so, store it as a pending status in the lwp_info structure + corresponding to LWPID. */ + void filter_event (int lwpid, int wstat); /* Wait for an event from child(ren) WAIT_PTID, and return any that match FILTER_PTID (leaving others pending). The PTIDs can be: -- 2.30.2