diff options
author | Simon Marchi <simon.marchi@efficios.com> | 2020-12-04 16:43:53 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@efficios.com> | 2020-12-04 16:43:53 -0500 |
commit | 28d5518b12119eaf087c64fe25e31d2f49e53485 (patch) | |
tree | 729974cc7c7c46b7bd834fb3a75102f350b20e54 /gdb/infrun.c | |
parent | f5f01699643e923edf7d0c661e330ceff609fac5 (diff) | |
download | gdb-28d5518b12119eaf087c64fe25e31d2f49e53485.zip gdb-28d5518b12119eaf087c64fe25e31d2f49e53485.tar.gz gdb-28d5518b12119eaf087c64fe25e31d2f49e53485.tar.bz2 |
gdb: rename things related to step over chains
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
Diffstat (limited to 'gdb/infrun.c')
-rw-r--r-- | gdb/infrun.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 7bde615..b965e70 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1237,14 +1237,14 @@ follow_exec (ptid_t ptid, const char *exec_file_target) matically get reset there in the new process.). */ } -/* The queue of threads that need to do a step-over operation to get +/* The chain of threads that need to do a step-over operation to get past e.g., a breakpoint. What technique is used to step over the breakpoint/watchpoint does not matter -- all threads end up in the same queue, to maintain rough temporal order of execution, in order to avoid starvation, otherwise, we could e.g., find ourselves constantly stepping the same couple threads past their breakpoints over and over, if the single-step finish fast enough. */ -struct thread_info *step_over_queue_head; +struct thread_info *global_thread_step_over_chain_head; /* Bit flags indicating what the thread needs to step over. */ @@ -1689,7 +1689,7 @@ displaced_step_prepare_throw (thread_info *tp) displaced_debug_printf ("deferring step of %s", target_pid_to_str (tp->ptid).c_str ()); - thread_step_over_chain_enqueue (tp); + global_thread_step_over_chain_enqueue (tp); return 0; } else @@ -1940,7 +1940,7 @@ start_step_over (void) if (step_over_info_valid_p ()) return false; - for (tp = step_over_queue_head; tp != NULL; tp = next) + for (tp = global_thread_step_over_chain_head; tp != NULL; tp = next) { struct execution_control_state ecss; struct execution_control_state *ecs = &ecss; @@ -1949,7 +1949,7 @@ start_step_over (void) gdb_assert (!tp->stop_requested); - next = thread_step_over_chain_next (tp); + next = global_thread_step_over_chain_next (tp); /* If this inferior already has a displaced step in process, don't start a new one. */ @@ -1967,9 +1967,9 @@ start_step_over (void) if (must_be_in_line && displaced_step_in_progress_any_inferior ()) return false; - thread_step_over_chain_remove (tp); + global_thread_step_over_chain_remove (tp); - if (step_over_queue_head == NULL) + if (global_thread_step_over_chain_head == NULL) infrun_debug_printf ("step-over queue now empty"); if (tp->control.trap_expected @@ -3026,7 +3026,7 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal) infrun_debug_printf ("need to step-over [%s] first", target_pid_to_str (tp->ptid).c_str ()); - thread_step_over_chain_enqueue (tp); + global_thread_step_over_chain_enqueue (tp); } switch_to_thread (cur_thr); @@ -3035,7 +3035,7 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal) /* Enqueue the current thread last, so that we move all other threads over their breakpoints first. */ if (cur_thr->stepping_over_breakpoint) - thread_step_over_chain_enqueue (cur_thr); + global_thread_step_over_chain_enqueue (cur_thr); /* If the thread isn't started, we'll still need to set its prev_pc, so that switch_back_to_stepped_thread knows the thread hasn't @@ -3219,7 +3219,7 @@ infrun_thread_stop_requested (ptid_t ptid) start_step_over doesn't try to resume them automatically. */ if (thread_is_in_step_over_chain (tp)) - thread_step_over_chain_remove (tp); + global_thread_step_over_chain_remove (tp); /* If the thread is stopped, but the user/frontend doesn't know about that yet, queue a pending event, as if the @@ -4823,7 +4823,7 @@ stop_all_threads (void) target_pid_to_str (t->ptid).c_str ()); t->control.trap_expected = 0; - thread_step_over_chain_enqueue (t); + global_thread_step_over_chain_enqueue (t); } } else @@ -4846,7 +4846,7 @@ stop_all_threads (void) { /* Add it back to the step-over queue. */ t->control.trap_expected = 0; - thread_step_over_chain_enqueue (t); + global_thread_step_over_chain_enqueue (t); } regcache = get_thread_regcache (t); @@ -7776,7 +7776,7 @@ keep_going_pass_signal (struct execution_control_state *ecs) infrun_debug_printf ("step-over already in progress: " "step-over for %s deferred", target_pid_to_str (tp->ptid).c_str ()); - thread_step_over_chain_enqueue (tp); + global_thread_step_over_chain_enqueue (tp); } else { |