Re: [PATCH v3 4/7] Per-inferior/Inferior-qualified thread IDs

Simon Marchi
2016-12-07T21:29:26Z

On 16-12-07 04:09 PM, Thomas Schwinge wrote:
> commit 14f6890677849172a4b13779acd9089c9baa3a81
> Author: Thomas Schwinge <thomas@codesourcery.com>
> Date: Tue May 24 19:36:57 2016 +0200
>
> Hurd: Adjust to "Per-inferior/Inferior-qualified thread IDs" changes
>
> [...]/gdb/gnu-nat.c: In function 'set_sig_thread_cmd':
> [...]/gdb/gnu-nat.c:2973:7: warning: implicit declaration of function 'thread_id_to_pid' [-Wimplicit-function-declaration]
> ptid_t ptid = thread_id_to_pid (atoi (args));
> ^
> [...]/gdb/gnu-nat.c:2973:7: error: invalid initializer
>
> That's commit 5d5658a1d3c3eb2a09c03f2f0662a1c01963c869, which renamed
> `thread_id_to_pid` to `global_thread_id_to_ptid`.
>
> gdb/
> * gnu-nat.c (set_sig_thread_cmd): Call global_thread_id_to_ptid
> instead of thread_id_to_pid.
> ---
> gdb/ChangeLog | 5 +++++
> gdb/gnu-nat.c | 2 +-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git gdb/ChangeLog gdb/ChangeLog
> index c251150..61d1205 100644
> --- gdb/ChangeLog
> +++ gdb/ChangeLog
> @@ -1,3 +1,8 @@
> +2016-12-07 Thomas Schwinge <thomas@codesourcery.com>
> +
> + * gnu-nat.c (set_sig_thread_cmd): Call global_thread_id_to_ptid
> + instead of thread_id_to_pid.
> +
> 2016-12-06 Simon Marchi <simon.marchi@ericsson.com>
>
> * inferior.c (inferior_command): Remove duplicate
> diff --git gdb/gnu-nat.c gdb/gnu-nat.c
> index 927ee5c..92b9292 100644
> --- gdb/gnu-nat.c
> +++ gdb/gnu-nat.c
> @@ -2964,7 +2964,7 @@ set_sig_thread_cmd (char *args, int from_tty)
> inf->signal_thread = 0;
> else
> {
> - ptid_t ptid = thread_id_to_pid (atoi (args));
> + ptid_t ptid = global_thread_id_to_ptid (atoi (args));

Hi Thomas,

I think your patch is better than the status quo, since it fixes the build.
However, global_thread_id_to_ptid expects global thread numbers, which are
nowadays only used in MI, never presented to the user in the CLI. Since this
is a CLI command, it should accept the inferior-qualified format instead.

Something similar to this should do the trick (I can't test it though):

diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 927ee5c6f1..6b4385d9c3 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -2964,13 +2964,13 @@ set_sig_thread_cmd (char *args, int from_tty)
inf->signal_thread = 0;
else
{
- ptid_t ptid = thread_id_to_pid (atoi (args));
+ struct thread_info *tp = parse_thread_id (args, NULL)

- if (ptid_equal (ptid, minus_one_ptid))
+ if (tp == nullptr)
error (_("Thread ID %s not known. "
"Use the \"info threads\" command to\n"
"see the IDs of currently known threads."), args);
- inf->signal_thread = inf_tid_to_thread (inf, ptid_get_lwp (ptid));
+ inf->signal_thread = inf_tid_to_thread (inf, ptid_get_lwp (tp->ptid));
}
}

If there's a more efficient/concise way to go from a thread_info* to a proc*, we
should probably use it, but I couldn't find one.

Simon