[PATCH 03/12] gdb: rename things related to step over chains

Pedro Alves pedro@palves.net
Wed Nov 25 01:28:53 GMT 2020


On 11/10/20 9:46 PM, Simon Marchi via Gdb-patches wrote:
> Rename step_over_queue_head to global_thread_step_over_chain_head, to
> make it more obvious when reading code that we are touching the global
> queue.  Rename all functions that operate on it to have "global" in
> their name, to make it clear on which chain they operate on.  Also, in a
> subsequent patch, we'll need both global and non-global versions of
> these functions, so it will be easier to do the distinction if they are
> named properly.
> 
> Normalize the naming to use "chain" everywhere instead of sometimes
> "queue", sometimes "chain".
> 
> I also reworded a few comments in gdbthread.h.  They implied that the
> step over chain is per-inferior, when in reality there is only one
> global chain, not one per inferior, as far as I understand.
> 
> gdb/ChangeLog:
> 
>         * gdbthread.h (thread_step_over_chain_enqueue): Rename to...
>         (global_thread_step_over_chain_enqueue): ... this.  Update all
> 	users.
>         (thread_step_over_chain_remove): Rename to...
>         (global_thread_step_over_chain_remove): ... this.  Update all
> 	users.
>         (thread_step_over_chain_next): Rename to...
>         (global_thread_step_over_chain_next): ... this.  Update all
> 	users.
>         * infrun.h (step_over_queue_head): Rename to...
> 	(global_thread_step_over_chain_head): ... this.  Update all
> 	users.
>         * infrun.c (step_over_queue_head): Rename to...
> 	(global_thread_step_over_chain_head): ... this.  Update all
> 	users.
>         * thread.c (step_over_chain_remove): Rename to...
> 	(thread_step_over_chain_remove): ... this.  Update all users.
> 	(thread_step_over_chain_next): Rename to...
>         (global_thread_step_over_chain_next): ... this.  Update all
> 	users.
>         (thread_step_over_chain_enqueue): Rename to...
>         (global_thread_step_over_chain_enqueue): ... this.  Update all
> 	users.
>         (thread_step_over_chain_remove): Rename to...
>         (global_thread_step_over_chain_remove): ... this.  Update all
> 	users.
> 
> Change-Id: Iabbf57d83c01321ca199d83fadb57f5b04e4d6d9
> ---
>  gdb/gdbthread.h | 16 ++++++++--------
>  gdb/infrun.c    | 26 +++++++++++++-------------
>  gdb/infrun.h    |  4 ++--
>  gdb/thread.c    | 18 +++++++++---------
>  4 files changed, 32 insertions(+), 32 deletions(-)
> 
> diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
> index 630727e2fb5..b5a32087289 100644
> --- a/gdb/gdbthread.h
> +++ b/gdb/gdbthread.h
> @@ -741,20 +741,20 @@ extern value *get_last_thread_stack_temporary (struct thread_info *tp);
>  extern bool value_in_thread_stack_temporaries (struct value *,
>  					       struct thread_info *thr);
>  
> -/* Add TP to the end of its inferior's pending step-over chain.  */
> +/* Add TP to the end of the global pending step-over chain.  */
>  
> -extern void thread_step_over_chain_enqueue (struct thread_info *tp);
> +extern void global_thread_step_over_chain_enqueue (struct thread_info *tp);
>  
> -/* Remove TP from its inferior's pending step-over chain.  */
> +/* Remove TP from the global pending step-over chain.  */
>  
> -extern void thread_step_over_chain_remove (struct thread_info *tp);
> +extern void global_thread_step_over_chain_remove (struct thread_info *tp);
>  
> -/* Return the next thread in the step-over chain starting at TP.  NULL
> -   if TP is the last entry in the chain.  */
> +/* Return the thread following TP in the global step-over chain, or NULL if TP
> +   is the last entry in the chain.  */
>  
> -extern struct thread_info *thread_step_over_chain_next (struct thread_info *tp);
> +extern struct thread_info *global_thread_step_over_chain_next (struct thread_info *tp);

Line too long now.

> --- a/gdb/thread.c
> +++ b/gdb/thread.c
> @@ -207,7 +207,7 @@ set_thread_exited (thread_info *tp, bool silent)
>  {
>    /* Dead threads don't need to step-over.  Remove from queue.  */

"Remove from chain", I guess.

>    if (tp->step_over_next != NULL)
> -    thread_step_over_chain_remove (tp);
> +    global_thread_step_over_chain_remove (tp);
>  

Otherwise OK.


More information about the Gdb-patches mailing list