Re: [PATCH 02/31] linux-nat: introduce pending_status_str

Andrew Burgess via Gdb-patches
2023-02-03T12:01:17Z

Pedro Alves <pedro@palves.net> writes:

> I noticed that some debug log output printing an lwp's pending status
> wasn't considering lp->waitstatus. This fixes it, by introducing a
> new pending_status_str function.

This patch looks fine. I had one slightly related question: I took a
look at the comment on lwp_info::waitstatus in linux-nat.h, which says:

/* If WAITSTATUS->KIND != TARGET_WAITKIND_SPURIOUS, the waitstatus
for this LWP's last event. This may correspond to STATUS above,
or to a local variable in lin_lwp_wait. */
struct target_waitstatus waitstatus;

Am I right in thinking that this comment is wrong; it should say
TARGET_WAITKIND_IGNORE, not TARGET_WAITKIND_SPURIOUS, right?

Thanks,
Andrew

>
> Change-Id: I66e5c7a363d30a925b093b195d72925ce5b6b980
> ---
> gdb/linux-nat.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
> index 17e5dce08c3..9b78fd1f8e8 100644
> --- a/gdb/linux-nat.c
> +++ b/gdb/linux-nat.c
> @@ -256,6 +256,19 @@ is_leader (lwp_info *lp)
> return lp->ptid.pid () == lp->ptid.lwp ();
> }
>
> +/* Convert an LWP's pending status to a std::string. */
> +
> +static std::string
> +pending_status_str (lwp_info *lp)
> +{
> + gdb_assert (lwp_status_pending_p (lp));
> +
> + if (lp->waitstatus.kind () != TARGET_WAITKIND_IGNORE)
> + return lp->waitstatus.to_string ();
> + else
> + return status_to_str (lp->status);
> +}
> +
> \f
> /* LWP accessors. */
>
> @@ -1647,8 +1660,8 @@ linux_nat_target::resume (ptid_t scope_ptid, int step, enum gdb_signal signo)
> this thread with a signal? */
> gdb_assert (signo == GDB_SIGNAL_0);
>
> - linux_nat_debug_printf ("Short circuiting for status 0x%x",
> - lp->status);
> + linux_nat_debug_printf ("Short circuiting for status %s",
> + pending_status_str (lp).c_str ());
>
> if (target_can_async_p ())
> {
> @@ -3137,7 +3150,7 @@ linux_nat_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus,
> if (lp != NULL)
> {
> linux_nat_debug_printf ("Using pending wait status %s for %s.",
> - status_to_str (lp->status).c_str (),
> + pending_status_str (lp).c_str (),
> lp->ptid.to_string ().c_str ());
> }
>
> --
> 2.36.0