* [PATCH 0/6] Refinement of scheduler-locking settings
@ 2023-12-29 10:41 Natalia Saiapova
2023-12-29 10:41 ` [PATCH 1/6] gdb: use schedlock_applies in user_visible_resume_ptid Natalia Saiapova
` (5 more replies)
0 siblings, 6 replies; 13+ messages in thread
From: Natalia Saiapova @ 2023-12-29 10:41 UTC (permalink / raw)
To: gdb-patches; +Cc: tankut.baris.aktemur
Hi all,
I want to come back to the topic I raised a few years ago about the
scheduler locking during the inferior calls.
For the history, here are the links to the previous threads:
https://sourceware.org/pipermail/gdb/2019-June/047996.html
https://sourceware.org/pipermail/gdb/2019-July/048003.html
> In multithreaded program, when several threads are stopped at a
> breakpoint and
> scheduler-locking mode is not 'on', there might be unexpected thread
> switches
> during an inferior call evaluation. If such thread switching occurs,
> the evaluation of the inferior call is abandoned:
>
> ~~~
> (gdb) run
> Thread 1 "a.out" hit Breakpoint 2, main._omp_fn.0(void) () at
> multi-omp.cpp:18
> 18 std::cout <<
> omp_get_thread_num();
> (gdb) call do_something()
> [Switching to Thread 0x7ffff6327700 (LWP 32498)]
>
> Thread 3 "a.out" hit Breakpoint 2, main._omp_fn.0(void) () at
> multi-omp.cpp:18
> 18 std::cout <<
> omp_get_thread_num();
> The program stopped in another thread while making a function call
> from GDB.
> Evaluation of the expression containing the function
> (do_something()) will be abandoned.
> When the function is done executing, GDB will silently stop.
> ~~~
The problem is that only scheduler-locking "on" can lock the scheduler
for inferior calls, which is quite restrictive for debugging.
A possible solution would be to add a new option, e.g., "eval", to the
existing "set scheduler-locking", but this might often be used
together with the "step" option, so a user would need to always remember
to switch the scheduler-locking to the correct option.
I chose a different and a more invasive direction and prepared a set of patches
that introduce a finer control over the scheduler locking. With that, a user
can choose for which types of commands the scheduler should be locked and mix
different locking strategies together. For the moment, I distinguish two modes
(normal and replay) and three command types (continuing, stepping, and inferior
call evaluation). This way, we can lock the scheduler during the stepping and
inferior calls, but leave it unlocked for "continue".
I tried to be backwards compatible, so all existing scheduler-locking
settings are expected to be preserved, however, the "show" commands had
to be changed.
I will be happy to hear your opinion on the proposed change to the
scheduler locking interface!
Regards
Natalia
My base commit is
3bb1944a5a0 asan: buffer overflow in loongarch_elf_rtype_to_howto
Natalia Saiapova (6):
gdb: use schedlock_applies in user_visible_resume_ptid.
gdb, cli: remove left-over code from "set_logging_on".
gdb, cli: pass the argument of a set command to its callback.
gdb: change the internal representation of scheduler locking.
gdb: add commands to control scheduler locking.
gdb: add eval option to lock the scheduler during infcalls.
gdb/NEWS | 21 +
gdb/cli/cli-logging.c | 5 -
gdb/cli/cli-setshow.c | 2 +-
gdb/doc/gdb.texinfo | 68 ++-
gdb/infrun.c | 410 +++++++++++++++---
.../gdb.mi/user-selected-context-sync.exp | 22 +-
.../gdb.threads/hand-call-in-threads.exp | 8 +-
.../multiple-successive-infcall.exp | 5 +-
gdb/testsuite/gdb.threads/schedlock.exp | 103 ++++-
gdb/testsuite/lib/gdb.exp | 57 ++-
10 files changed, 580 insertions(+), 121 deletions(-)
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/6] gdb: use schedlock_applies in user_visible_resume_ptid.
2023-12-29 10:41 [PATCH 0/6] Refinement of scheduler-locking settings Natalia Saiapova
@ 2023-12-29 10:41 ` Natalia Saiapova
2024-02-08 18:50 ` Tom Tromey
2023-12-29 10:41 ` [PATCH 2/6] gdb, cli: remove left-over code from "set_logging_on" Natalia Saiapova
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Natalia Saiapova @ 2023-12-29 10:41 UTC (permalink / raw)
To: gdb-patches; +Cc: tankut.baris.aktemur
This is a refactoring. The logic in user_visible_resume_ptid is very
similar to schedlock_applies, but uses `step` parameter instead of
`tp->control.stepping_command`.
Refactor schedlock_applies logic into the following two methods:
bool schedlock_applies_to_thread (thread_info *tp)
and
bool schedlock_applies (bool step)
such that they share the logic.
Update the call-sites accordingly, where we have only the thread, use
the former, and where we have the bool step, use the latter.
---
gdb/infrun.c | 49 +++++++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 1d863896c40..e10bde94744 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -107,7 +107,9 @@ static bool start_step_over (void);
static bool step_over_info_valid_p (void);
-static bool schedlock_applies (struct thread_info *tp);
+static bool schedlock_applies_to_thread (thread_info *tp);
+
+static bool schedlock_applies (bool step);
/* Asynchronous signal handler registered as event loop source for
when we have pending events ready to be passed to the core. */
@@ -1970,7 +1972,7 @@ any_thread_needs_target_thread_events (process_stratum_target *target,
{
for (thread_info *tp : all_non_exited_threads (target, resume_ptid))
if (displaced_step_in_progress_thread (tp)
- || schedlock_applies (tp)
+ || schedlock_applies_to_thread (tp)
|| tp->thread_fsm () != nullptr)
return true;
return false;
@@ -1983,7 +1985,7 @@ static void
update_thread_events_after_step_over (thread_info *event_thread,
const target_waitstatus &event_status)
{
- if (schedlock_applies (event_thread))
+ if (schedlock_applies_to_thread (event_thread))
{
/* If scheduler-locking applies, continue reporting
thread-created/thread-cloned events. */
@@ -2383,6 +2385,9 @@ ptid_t
user_visible_resume_ptid (int step)
{
ptid_t resume_ptid;
+ thread_info *tp = nullptr;
+ if (inferior_ptid != null_ptid)
+ tp = inferior_thread ();
if (non_stop)
{
@@ -2390,20 +2395,12 @@ user_visible_resume_ptid (int step)
individually. */
resume_ptid = inferior_ptid;
}
- else if ((scheduler_mode == schedlock_on)
- || (scheduler_mode == schedlock_step && step))
+ else if (schedlock_applies (step))
{
/* User-settable 'scheduler' mode requires solo thread
resume. */
resume_ptid = inferior_ptid;
}
- else if ((scheduler_mode == schedlock_replay)
- && target_record_will_replay (minus_one_ptid, execution_direction))
- {
- /* User-settable 'scheduler' mode requires solo thread resume in replay
- mode. */
- resume_ptid = inferior_ptid;
- }
else if (!sched_multi && target_supports_multi_process ())
{
/* Resume all threads of the current process (and none of other
@@ -2574,7 +2571,7 @@ do_target_resume (ptid_t resume_ptid, bool step, enum gdb_signal sig)
*/
if (step_over_info_valid_p ()
|| displaced_step_in_progress_thread (tp)
- || schedlock_applies (tp))
+ || schedlock_applies_to_thread (tp))
{
gdb_thread_options options
= GDB_THREAD_OPTION_CLONE | GDB_THREAD_OPTION_EXIT;
@@ -3185,15 +3182,23 @@ thread_still_needs_step_over (struct thread_info *tp)
return what;
}
+/* Returns true if scheduler locking applies to TP. */
+
+static bool
+schedlock_applies_to_thread (thread_info *tp)
+{
+ bool step = (tp != nullptr) && tp->control.stepping_command;
+ return schedlock_applies (step);
+}
+
/* Returns true if scheduler locking applies. STEP indicates whether
- we're about to do a step/next-like command to a thread. */
+ we're about to do a step/next-like command. */
static bool
-schedlock_applies (struct thread_info *tp)
+schedlock_applies (bool step)
{
return (scheduler_mode == schedlock_on
- || (scheduler_mode == schedlock_step
- && tp->control.stepping_command)
+ || (scheduler_mode == schedlock_step && step)
|| (scheduler_mode == schedlock_replay
&& target_record_will_replay (minus_one_ptid,
execution_direction)));
@@ -3690,7 +3695,7 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal)
/* If scheduler locking applies, we can avoid iterating over all
threads. */
- if (!non_stop && !schedlock_applies (cur_thr))
+ if (!non_stop && !schedlock_applies_to_thread (cur_thr))
{
for (thread_info *tp : all_non_exited_threads (resume_target,
resume_ptid))
@@ -5938,7 +5943,7 @@ handle_thread_exited (execution_control_state *ecs)
}
inferior *inf = ecs->event_thread->inf;
- bool slock_applies = schedlock_applies (ecs->event_thread);
+ bool slock_applies = schedlock_applies_to_thread (ecs->event_thread);
delete_thread (ecs->event_thread);
ecs->event_thread = nullptr;
@@ -6377,7 +6382,7 @@ handle_inferior_event (struct execution_control_state *ecs)
/* If resuming the child, mark it running. */
if ((ecs->ws.kind () == TARGET_WAITKIND_THREAD_CLONED
- && !schedlock_applies (ecs->event_thread))
+ && !schedlock_applies_to_thread (ecs->event_thread))
|| (ecs->ws.kind () != TARGET_WAITKIND_THREAD_CLONED
&& (follow_child
|| (!detach_fork && (non_stop || sched_multi)))))
@@ -6386,7 +6391,7 @@ handle_inferior_event (struct execution_control_state *ecs)
/* In non-stop mode, also resume the other branch. */
if ((ecs->ws.kind () == TARGET_WAITKIND_THREAD_CLONED
&& target_is_non_stop_p ()
- && !schedlock_applies (ecs->event_thread))
+ && !schedlock_applies_to_thread (ecs->event_thread))
|| (ecs->ws.kind () != TARGET_WAITKIND_THREAD_CLONED
&& (!detach_fork && (non_stop
|| (sched_multi
@@ -8249,7 +8254,7 @@ switch_back_to_stepped_thread (struct execution_control_state *ecs)
current thread is stepping. If some other thread not the
event thread is stepping, then it must be that scheduler
locking is not in effect. */
- if (schedlock_applies (ecs->event_thread))
+ if (schedlock_applies_to_thread (ecs->event_thread))
return false;
/* Otherwise, we no longer expect a trap in the current thread.
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/6] gdb, cli: remove left-over code from "set_logging_on".
2023-12-29 10:41 [PATCH 0/6] Refinement of scheduler-locking settings Natalia Saiapova
2023-12-29 10:41 ` [PATCH 1/6] gdb: use schedlock_applies in user_visible_resume_ptid Natalia Saiapova
@ 2023-12-29 10:41 ` Natalia Saiapova
2024-02-08 18:50 ` Tom Tromey
2023-12-29 10:41 ` [PATCH 3/6] gdb, cli: pass the argument of a set command to its callback Natalia Saiapova
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Natalia Saiapova @ 2023-12-29 10:41 UTC (permalink / raw)
To: gdb-patches; +Cc: tankut.baris.aktemur
This is a refactoring. Remove the left-over code, which rewrites
the logging filename in "set logging on" command.
The code became unused after the deprecation of "set logging (on|off)"
command. Before the deprecation, the command could also take a file
name and rewrite the logging file, e.g.:
(gdb) set logging on lalala
Copying output to lalala.
Copying debug output to lalala.
After the command was deprecated and reimplemented as an alias to "set
logging enable on", additional input after "on" became invalid:
(gdb) set logging on lalala
Warning: 'set logging on', an alias for the command 'set logging enabled', is deprecated.
Use 'set logging enabled on'.
"on" or "off" expected.
(gdb) set logging on lalala
"on" or "off" expected.
(gdb) set logging enable on lalala
"on" or "off" expected.
(gdb) set logging enable on
Copying output to gdb.txt.
Copying debug output to gdb.txt.
---
gdb/cli/cli-logging.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index a74e43034e8..e2ce0262538 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -160,11 +160,6 @@ handle_redirections (int from_tty)
static void
set_logging_on (const char *args, int from_tty)
{
- const char *rest = args;
-
- if (rest && *rest)
- logging_filename = rest;
-
handle_redirections (from_tty);
}
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/6] gdb, cli: pass the argument of a set command to its callback.
2023-12-29 10:41 [PATCH 0/6] Refinement of scheduler-locking settings Natalia Saiapova
2023-12-29 10:41 ` [PATCH 1/6] gdb: use schedlock_applies in user_visible_resume_ptid Natalia Saiapova
2023-12-29 10:41 ` [PATCH 2/6] gdb, cli: remove left-over code from "set_logging_on" Natalia Saiapova
@ 2023-12-29 10:41 ` Natalia Saiapova
2024-02-08 18:45 ` Tom Tromey
2023-12-29 10:42 ` [PATCH 4/6] gdb: change the internal representation of scheduler locking Natalia Saiapova
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Natalia Saiapova @ 2023-12-29 10:41 UTC (permalink / raw)
To: gdb-patches; +Cc: tankut.baris.aktemur
This might be useful, if some commands need to have a special case if
run w/o arguments.
---
gdb/cli/cli-setshow.c | 2 +-
gdb/infrun.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 11f93068b68..158425a9df1 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -448,7 +448,7 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
error (_("gdb internal error: bad var_type in do_setshow_command"));
}
- c->func (NULL, from_tty, c);
+ c->func (arg, from_tty, c);
if (notify_command_param_changed_p (option_changed, c))
{
diff --git a/gdb/infrun.c b/gdb/infrun.c
index e10bde94744..b8feef6bc2d 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2385,9 +2385,6 @@ ptid_t
user_visible_resume_ptid (int step)
{
ptid_t resume_ptid;
- thread_info *tp = nullptr;
- if (inferior_ptid != null_ptid)
- tp = inferior_thread ();
if (non_stop)
{
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/6] gdb: change the internal representation of scheduler locking.
2023-12-29 10:41 [PATCH 0/6] Refinement of scheduler-locking settings Natalia Saiapova
` (2 preceding siblings ...)
2023-12-29 10:41 ` [PATCH 3/6] gdb, cli: pass the argument of a set command to its callback Natalia Saiapova
@ 2023-12-29 10:42 ` Natalia Saiapova
2023-12-29 11:49 ` Eli Zaretskii
2023-12-29 10:42 ` [PATCH 5/6] gdb: add commands to control " Natalia Saiapova
2023-12-29 10:42 ` [PATCH 6/6] gdb: add eval option to lock the scheduler during infcalls Natalia Saiapova
5 siblings, 1 reply; 13+ messages in thread
From: Natalia Saiapova @ 2023-12-29 10:42 UTC (permalink / raw)
To: gdb-patches; +Cc: tankut.baris.aktemur
Introduce a new structure to manage different options of the scheduler
locking. The options can coexist together and be set individually.
In the next patch
gdb: add commands to control scheduler locking.
we introduce the commands to control these options. In this patch we do
not introduce new commands and keep the previous API.
New scheduler locking options are:
replay run -- control non-stepping commands during replay mode.
replay step -- control stepping commands during replay mode.
run -- control non-stepping commands during normal exection.
step -- control stepping commands during normal exection.
Internally they hold a bool value, when true the locking is enabled.
Mapping to the old settings
Old Settings | New settings
-----------------------------------
off | all are false
|
replay | run = false, step = false,
| replay run = true, replay step = true
|
step | run = false, step = true,
| replay run = false, replay step = true
|
on | all are true
---
gdb/infrun.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 115 insertions(+), 7 deletions(-)
diff --git a/gdb/infrun.c b/gdb/infrun.c
index b8feef6bc2d..f70f615abf8 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -111,6 +111,11 @@ static bool schedlock_applies_to_thread (thread_info *tp);
static bool schedlock_applies (bool step);
+struct schedlock_options;
+
+static bool schedlock_applies_to_opts (const schedlock_options &opts,
+ bool step);
+
/* Asynchronous signal handler registered as event loop source for
when we have pending events ready to be passed to the core. */
static struct async_event_handler *infrun_async_inferior_event_token;
@@ -2322,7 +2327,69 @@ infrun_thread_ptid_changed (process_stratum_target *target,
inferior_ptid = new_ptid;
}
-\f
+/* A structure to hold scheduler locking settings for
+ a mode, replay or normal. */
+struct schedlock_options
+{
+ struct option {
+ const std::string name;
+ bool value;
+
+ option () = delete;
+ option (std::string name, bool value)
+ : name (std::move (name)), value (value)
+ {}
+
+ /* Forbid accidential copying. */
+ option (const option &) = delete;
+ option operator= (const option &) = delete;
+ option (option &&) = default;
+ option &operator= (option &&) = default;
+
+ operator bool () const { return value; }
+ const char *c_str () const { return value ? "on" : "off"; }
+ /* Set new value. Return true, if the value has changed. */
+ bool set (bool new_value);
+ };
+
+ schedlock_options () = delete;
+ schedlock_options (option run, option step)
+ : run (std::move (run)), step (std::move (step))
+ {}
+
+ /* Forbid accidential copying. */
+ schedlock_options (const schedlock_options &) = delete;
+ schedlock_options operator= (const schedlock_options &) = delete;
+ schedlock_options (schedlock_options &&) = default;
+ schedlock_options &operator= (schedlock_options &&) = default;
+
+ /* If true, the scheduler is locked during non-stepping. */
+ option run;
+ /* If true, the scheduler is locked during stepping. */
+ option step;
+};
+
+bool
+schedlock_options::option::set (bool new_value)
+{
+ if (value != new_value)
+ {
+ value = new_value;
+ return true;
+ }
+
+ return false;
+}
+
+struct schedlock
+{
+ schedlock (schedlock_options opt, schedlock_options replay_opt)
+ : normal (std::move (opt)), replay (std::move (replay_opt))
+ {}
+
+ schedlock_options normal;
+ schedlock_options replay;
+};
static const char schedlock_off[] = "off";
static const char schedlock_on[] = "on";
@@ -2335,7 +2402,34 @@ static const char *const scheduler_enums[] = {
schedlock_replay,
nullptr
};
+
static const char *scheduler_mode = schedlock_replay;
+
+schedlock schedlock {{{"run", false}, {"step", false}},
+ {{"replay run", true}, {"replay step", true}}};
+
+/* A helper function to set scheduler locking shortcuts:
+ set scheduler-locking on: all options are on.
+ set scheduler-locking off: all options are off.
+ set scheduler-locking replay: only replay options are on.
+ set scheduler-locking step: only "step" and "replay step" are on. */
+
+static void
+set_schedlock_shortcut_option (const char *shortcut)
+{
+ bool is_on = (shortcut == schedlock_on);
+ bool is_step = (shortcut == schedlock_step);
+ bool is_replay = (shortcut == schedlock_replay);
+ bool is_off = (shortcut == schedlock_off);
+ /* Check that we got a valid shortcut option. */
+ gdb_assert (is_on || is_step || is_replay || is_off);
+
+ schedlock.normal.run.set (is_on);
+ schedlock.normal.step.set (is_on || is_step);
+ schedlock.replay.run.set (is_on || is_replay);
+ schedlock.replay.step.set (is_on || is_replay || is_step);
+}
+
static void
show_scheduler_mode (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
@@ -2352,9 +2446,13 @@ set_schedlock_func (const char *args, int from_tty, struct cmd_list_element *c)
if (!target_can_lock_scheduler ())
{
scheduler_mode = schedlock_off;
+ /* Set scheduler locking off. */
+ set_schedlock_shortcut_option (schedlock_off);
error (_("Target '%s' cannot support this command."),
target_shortname ());
}
+
+ set_schedlock_shortcut_option (scheduler_mode);
}
/* True if execution commands resume all threads of all processes by
@@ -3102,7 +3200,7 @@ clear_proceed_status (int step)
This is a convenience feature to not require the user to explicitly
stop replaying the other threads. We're assuming that the user's
intent is to resume tracing the recorded process. */
- if (!non_stop && scheduler_mode == schedlock_replay
+ if (!non_stop && schedlock_applies_to_opts (schedlock.replay, step)
&& target_record_is_replaying (minus_one_ptid)
&& !target_record_will_replay (user_visible_resume_ptid (step),
execution_direction))
@@ -3179,6 +3277,17 @@ thread_still_needs_step_over (struct thread_info *tp)
return what;
}
+/* Return true if OPTS lock the scheduler.
+ STEP indicates whether a thread is about to step.
+ Note, this does not take into the account the mode (replay or
+ normal execution). */
+
+static bool
+schedlock_applies_to_opts (const schedlock_options &opts, bool step)
+{
+ return ((opts.run && !step) || (opts.step && step));
+}
+
/* Returns true if scheduler locking applies to TP. */
static bool
@@ -3194,11 +3303,10 @@ schedlock_applies_to_thread (thread_info *tp)
static bool
schedlock_applies (bool step)
{
- return (scheduler_mode == schedlock_on
- || (scheduler_mode == schedlock_step && step)
- || (scheduler_mode == schedlock_replay
- && target_record_will_replay (minus_one_ptid,
- execution_direction)));
+ bool is_replay = target_record_will_replay (minus_one_ptid,
+ execution_direction);
+ schedlock_options &opts = is_replay ? schedlock.replay : schedlock.normal;
+ return schedlock_applies_to_opts (opts, step);
}
/* Set process_stratum_target::COMMIT_RESUMED_STATE in all target
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/6] gdb: add commands to control scheduler locking.
2023-12-29 10:41 [PATCH 0/6] Refinement of scheduler-locking settings Natalia Saiapova
` (3 preceding siblings ...)
2023-12-29 10:42 ` [PATCH 4/6] gdb: change the internal representation of scheduler locking Natalia Saiapova
@ 2023-12-29 10:42 ` Natalia Saiapova
2023-12-29 12:03 ` Eli Zaretskii
2023-12-29 10:42 ` [PATCH 6/6] gdb: add eval option to lock the scheduler during infcalls Natalia Saiapova
5 siblings, 1 reply; 13+ messages in thread
From: Natalia Saiapova @ 2023-12-29 10:42 UTC (permalink / raw)
To: gdb-patches; +Cc: tankut.baris.aktemur
In this patch, we introduce new command options for set/show scheduler
locking. New options give the user finer control over the scheduler.
Introduce
set scheduler-locking <step | run | replay step | replay run> <on | off>
show scheduler-locking <step | run | replay step | replay run>
For example, with these commands a user can get a combined scheduler locking
for stepping commands during the normal execution and for all commands in
replay mode.
The existing scheduler-locking settings still exist and work as
shortcuts.
set scheduler-locking step
is equivalent to
set scheduler-locking replay run off
set scheduler-locking replay step on
set scheduler-locking run off
set scheduler-locking step on
set scheduler-locking on
is equivalent to
set scheduler-locking replay run on
set scheduler-locking replay step on
set scheduler-locking run on
set scheduler-locking step on
set scheduler-locking replay
is equivalent to
set scheduler-locking replay run on
set scheduler-locking replay step on
set scheduler-locking run off
set scheduler-locking step off
set scheduler-locking off
is equivalent to
set scheduler-locking replay run off
set scheduler-locking replay step off
set scheduler-locking run off
set scheduler-locking step off
This is bound to the structure we introduced in the previous commit:
gdb: change the internal representation of scheduler locking.
To introduce it under scheduler-locking I had to change the way the show
command works.
(gdb) show scheduler-locking
scheduler-locking replay run: "on" Scheduler locking for non-stepping commands is "on" during replay mode.
scheduler-locking replay step: "on" Scheduler locking for stepping commands is "on" during replay mode.
scheduler-locking run: "off" Scheduler locking for non-stepping commands is "off" during normal execution.
scheduler-locking step: "off" Scheduler locking for stepping commands is "off" during normal execution.
(gdb) show scheduler-locking replay
scheduler-locking replay run: "on" Scheduler locking for non-stepping commands is "on" during replay mode.
scheduler-locking replay step: "on" Scheduler locking for stepping commands is "on" during replay mode.
(gdb) show scheduler-locking replay step
"on" Scheduler locking for stepping commands is "on" during replay mode.
(gdb) show scheduler-locking run
"off" Scheduler locking for non-stepping commands is "off" during normal execution.
Note, there is a small inconsistency with the "set scheduler-locking
step". If we did not keep the older way of setting the scheduler
locking, command
set scheduler-locking step
would be the same as
set scheduler-locking step on
while to be backward compatible, we have it as
set scheduler-locking step on
set scheduler-locking replay step on
---
gdb/NEWS | 17 ++
gdb/doc/gdb.texinfo | 61 ++++-
gdb/infrun.c | 220 ++++++++++++++----
.../gdb.mi/user-selected-context-sync.exp | 20 +-
.../gdb.threads/hand-call-in-threads.exp | 8 +-
.../multiple-successive-infcall.exp | 5 +-
gdb/testsuite/gdb.threads/schedlock.exp | 79 ++++++-
gdb/testsuite/lib/gdb.exp | 53 ++++-
8 files changed, 367 insertions(+), 96 deletions(-)
diff --git a/gdb/NEWS b/gdb/NEWS
index 4358494a6b6..bdbbadacb89 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -18,6 +18,23 @@ disassemble
* New commands
+set scheduler-locking replay run | replay step | run | step (on|off)
+show scheduler-locking (replay run | replay step | run | step)
+ Extend the scheduler locking settings with a set of set/show
+ commands, which can be used individually to control the scheduler during
+ various commands.
+ 'replay run' -- when on, the scheduler is locked during non-stepping
+ commands in replay mode.
+ 'replay step' -- when on, the scheduler is locked during stepping
+ commands in replay mode.
+ 'run' -- when on, the scheduler is locked during non-stepping commands
+ in normal mode.
+ 'step' -- when on, the scheduler is locked during stepping commands
+ in normal mode.
+ The older scheduler locking settings can be used as shortcuts, their behavior
+ is not changed.
+ The output of "show scheduler-locking" has changed to support the new settings.
+
info missing-debug-handler
List all the registered missing debug handlers.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 42a91235661..0560b9a5ea7 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -7110,22 +7110,56 @@ On some OSes, you can modify @value{GDBN}'s default behavior by
locking the OS scheduler to allow only a single thread to run.
@table @code
-@item set scheduler-locking @var{mode}
-@cindex scheduler-locking
+
+@item set scheduler-locking @var{type} [@code{on}|@code{off}]
+@cindex scheduler locking type
+@cindex lock scheduler
+Set the scheduler locking settings. It applies to normal execution,
+record mode, and replay mode. The scheduler locking can be set separately
+for stepping and non-stepping commands.
+
+@table @code
+@item replay run
+When @code{on} the scheduler is locked for non-stepping commands during
+replay mode. For commands like @samp{continue}, @samp{until}, @samp{finish},
+or expression evaluation only the current thread may run.
+
+@item replay step
+When @code{on} the scheduler is locked for stepping commands during replay
+mode. This mode optimizes for single-stepping; only the current thread is
+resumed while you are stepping, so that the focus of debugging does not change
+unexpectedly.
+
+@item run
+When @code{on} the scheduler is locked for non-stepping commands during
+normal execution and record modes. For commands like @samp{continue},
+@samp{until}, @samp{finish}, or expression evaluation only the current
+thread may run.
+
+@item step
+When @code{on} the scheduler is locked for stepping commands during
+normal execution and record modes. This mode optimizes for single-stepping;
+only the current thread is resumed while you are stepping, so that the focus
+of debugging does not change unexpectedly.
+
+@end table
+
+@item set scheduler-locking @var{shortcut-mode}
@cindex scheduler locking mode
@cindex lock scheduler
-Set the scheduler locking mode. It applies to normal execution,
-record mode, and replay mode. @var{mode} can be one of
-the following:
+One can choose to not set the scheduler locking settings individually but use
+the following predefined shortcut modes.
@table @code
@item off
-There is no locking and any thread may run at any time.
+There is no locking and any thread may run at any time. This is equivalent to
+setting all options to @code{off}.
@item on
-Only the current thread may run when the inferior is resumed. New
+Only the current thread may run when the inferior is resumed. New
threads created by the resumed thread are held stopped at their entry
-point, before they execute any instruction.
+point, before they execute any instruction. This is
+equivalent to setting all options to @code{on}.
@item step
Behaves like @code{on} when stepping, and @code{off} otherwise.
@@ -7140,9 +7174,18 @@ another thread hits a breakpoint during its timeslice, @value{GDBN}
does not change the current thread away from the thread that you are
debugging.
+This is equivalent to set @samp{scheduler-locking step} and
+@samp{scheduler-locking replay step} to @code{on}, while other settings
+are @code{off}.
+
@item replay
Behaves like @code{on} in replay mode, and @code{off} in either record
mode or during normal execution. This is the default mode.
+
+This is equivalent to set @samp{scheduler-locking replay run} and
+@samp{scheduler-locking replay step} to @code{on}, while other settings
+are @code{off}.
+
@end table
@item show scheduler-locking
@@ -33949,7 +33992,7 @@ the end or beginning of a replay log if one is being used.
@end itemize
In all-stop mode (@pxref{All-Stop
Mode}), may resume only one thread, or all threads, depending on the
-value of the @samp{scheduler-locking} variable. If @samp{--all} is
+value of the @samp{scheduler-locking} variables. If @samp{--all} is
specified, all threads (in all inferiors) will be resumed. The @samp{--all} option is
ignored in all-stop mode. If the @samp{--thread-group} options is
specified, then all threads in that thread group are resumed.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index f70f615abf8..daf8cecd601 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -77,6 +77,7 @@
#include "extension.h"
#include "disasm.h"
#include "interps.h"
+#include "cli/cli-decode.h"
/* Prototypes for local functions */
@@ -116,6 +117,12 @@ struct schedlock_options;
static bool schedlock_applies_to_opts (const schedlock_options &opts,
bool step);
+/* Command lists for the scheduler locking. */
+static cmd_list_element *schedlock_set_cmdlist;
+static cmd_list_element *schedlock_show_cmdlist;
+static cmd_list_element *schedlock_set_replay_cmdlist;
+static cmd_list_element *schedlock_show_replay_cmdlist;
+
/* Asynchronous signal handler registered as event loop source for
when we have pending events ready to be passed to the core. */
static struct async_event_handler *infrun_async_inferior_event_token;
@@ -2348,7 +2355,8 @@ struct schedlock_options
operator bool () const { return value; }
const char *c_str () const { return value ? "on" : "off"; }
- /* Set new value. Return true, if the value has changed. */
+ /* Set new value. Return true, if the value has changed.
+ Also notifies the observer, if the value has changed. */
bool set (bool new_value);
};
@@ -2375,6 +2383,8 @@ schedlock_options::option::set (bool new_value)
if (value != new_value)
{
value = new_value;
+ std::string param_name = "scheduler-locking " + name;
+ interps_notify_param_changed (param_name.c_str (), c_str ());
return true;
}
@@ -2395,15 +2405,6 @@ static const char schedlock_off[] = "off";
static const char schedlock_on[] = "on";
static const char schedlock_step[] = "step";
static const char schedlock_replay[] = "replay";
-static const char *const scheduler_enums[] = {
- schedlock_off,
- schedlock_on,
- schedlock_step,
- schedlock_replay,
- nullptr
-};
-
-static const char *scheduler_mode = schedlock_replay;
schedlock schedlock {{{"run", false}, {"step", false}},
{{"replay run", true}, {"replay step", true}}};
@@ -2424,35 +2425,89 @@ set_schedlock_shortcut_option (const char *shortcut)
/* Check that we got a valid shortcut option. */
gdb_assert (is_on || is_step || is_replay || is_off);
- schedlock.normal.run.set (is_on);
- schedlock.normal.step.set (is_on || is_step);
- schedlock.replay.run.set (is_on || is_replay);
- schedlock.replay.step.set (is_on || is_replay || is_step);
+ bool any_changed = schedlock.normal.run.set (is_on);
+ any_changed = schedlock.normal.step.set (is_on || is_step) || any_changed;
+ any_changed = schedlock.replay.run.set (is_on || is_replay) || any_changed;
+ any_changed = schedlock.replay.step.set (is_on || is_replay || is_step)
+ || any_changed;
+
+ /* If at least one parameter has changed, notify the observer
+ in the old-fashioned way. */
+ if (any_changed)
+ interps_notify_param_changed ("scheduler-locking", shortcut);
}
+/* Default callback for set methods of scheduler locking options.
+ Checks that the scheduler locking is supported.
+ If no, it reverts all options to "off" and throws an error. */
+
static void
-show_scheduler_mode (struct ui_file *file, int from_tty,
- struct cmd_list_element *c, const char *value)
+set_schedlock_callback (const char *args, int from_tty, cmd_list_element *c)
{
- gdb_printf (file,
- _("Mode for locking scheduler "
- "during execution is \"%s\".\n"),
- value);
+ if (target_can_lock_scheduler ())
+ return;
+
+ /* Set scheduler locking off and error out. */
+ set_schedlock_shortcut_option (schedlock_off);
+ error (_("Target '%s' cannot support this command."), target_shortname ());
}
+/* Support for shortcut schedlock options: "on", "off", "step", "replay". */
+
static void
-set_schedlock_func (const char *args, int from_tty, struct cmd_list_element *c)
+set_schedlock_step (const char *args, int from_tty, cmd_list_element *c)
{
- if (!target_can_lock_scheduler ())
- {
- scheduler_mode = schedlock_off;
- /* Set scheduler locking off. */
- set_schedlock_shortcut_option (schedlock_off);
- error (_("Target '%s' cannot support this command."),
- target_shortname ());
- }
+ if (!args || !*args)
+ set_schedlock_shortcut_option (schedlock_step);
+ set_schedlock_callback (args, from_tty, nullptr);
+}
+
+static void
+set_schedlock_replay (const char *args, int from_tty)
+{
+ set_schedlock_shortcut_option (schedlock_replay);
+ set_schedlock_callback (args, from_tty, nullptr);
+}
- set_schedlock_shortcut_option (scheduler_mode);
+static void
+set_schedlock_on (const char *args, int from_tty)
+{
+ set_schedlock_shortcut_option (schedlock_on);
+ set_schedlock_callback (args, from_tty, nullptr);
+}
+
+static void
+set_schedlock_off (const char *args, int from_tty)
+{
+ set_schedlock_shortcut_option (schedlock_off);
+ set_schedlock_callback (args, from_tty, nullptr);
+}
+
+/* Default method to show a single option of scheduler locking. */
+
+static void
+show_schedlock_option (ui_file *file, int from_tty,
+ cmd_list_element *c, const char *value)
+{
+ gdb_assert (c->prefix != nullptr);
+ const char *mode;
+ if (strcmp (c->prefix->name, "replay") == 0)
+ mode = "replay mode";
+ else if (strcmp (c->prefix->name, "scheduler-locking") == 0)
+ mode = "normal execution";
+ else
+ gdb_assert_not_reached ("Unexpected command prefix.");
+
+ const char *type;
+ if (strcmp (c->name, "step") == 0)
+ type = "stepping commands";
+ else if (strcmp (c->name, "run") == 0)
+ type = "non-stepping commands";
+ else
+ gdb_assert_not_reached ("Unexpected command name.");
+
+ gdb_printf (file, _("\"%s\"\tScheduler locking for %s is "
+ "\"%s\" during the %s.\n"), value, type, value, mode);
}
/* True if execution commands resume all threads of all processes by
@@ -8354,14 +8409,6 @@ switch_back_to_stepped_thread (struct execution_control_state *ecs)
return true;
}
- /* If scheduler locking applies even if not stepping, there's no
- need to walk over threads. Above we've checked whether the
- current thread is stepping. If some other thread not the
- event thread is stepping, then it must be that scheduler
- locking is not in effect. */
- if (schedlock_applies_to_thread (ecs->event_thread))
- return false;
-
/* Otherwise, we no longer expect a trap in the current thread.
Clear the trap_expected flag before switching back -- this is
what keep_going does as well, if we call it. */
@@ -10652,21 +10699,92 @@ By default, the debugger will use the same inferior."),
show_follow_exec_mode_string,
&setlist, &showlist);
- add_setshow_enum_cmd ("scheduler-locking", class_run,
- scheduler_enums, &scheduler_mode, _("\
-Set mode for locking scheduler during execution."), _("\
-Show mode for locking scheduler during execution."), _("\
-off == no locking (threads may preempt at any time)\n\
-on == full locking (no thread except the current thread may run)\n\
- This applies to both normal execution and replay mode.\n\
-step == scheduler locked during stepping commands (step, next, stepi, nexti).\n\
- In this mode, other threads may run during other commands.\n\
- This applies to both normal execution and replay mode.\n\
-replay == scheduler locked in replay mode and unlocked during normal execution."),
- set_schedlock_func, /* traps on target vector */
- show_scheduler_mode,
+ /* Commands for set/show scheduler-locking. */
+
+ add_setshow_prefix_cmd ("scheduler-locking", class_run, _("\
+Scheduler locking settings.\n\
+Configure scheduler locking settings in various conditions."), _("\
+Show scheduler locking settings in various conditions."),
+ &schedlock_set_cmdlist,
+ &schedlock_show_cmdlist,
&setlist, &showlist);
+ add_setshow_boolean_cmd ("run", class_run, &schedlock.normal.run.value, _("\
+Scheduler locking for non-stepping commands during normal execution."), _("\
+Show scheduler locking for non-stepping commands during normal execution."),
+ _("\
+Controls scheduler locking for non-stepping commands during normal execution.\n\
+Commands include continue, until, finish. The setting does not affect \
+stepping."),
+ set_schedlock_callback,
+ show_schedlock_option,
+ &schedlock_set_cmdlist,
+ &schedlock_show_cmdlist);
+
+ add_setshow_boolean_cmd ("step", class_run, &schedlock.normal.step.value, _("\
+Scheduler locking for stepping commands. W/o arguments locks the scheduler \
+for stepping."), _("\
+Show scheduler locking for stepping commands during normal execution."), _("\
+If argument \"on\" or \"off\", sets scheduler locking behavior for stepping\n\
+commands only during normal execution.\n\
+Commands include step, next, stepi, nexti."),
+ set_schedlock_step,
+ show_schedlock_option,
+ &schedlock_set_cmdlist,
+ &schedlock_show_cmdlist);
+
+ /* Commands for set/show scheduler-locking in replay mode.
+ The base command adds support for the shortcut
+ set scheduler-locking replay
+ command. */
+
+ add_setshow_prefix_cmd ("replay", class_run, _("\
+Scheduler locking settings for replay mode.\n\
+Configure scheduler locking in various conditions such as during continuing\n\
+or stepping."),
+("Show scheduler locking in replay mode."),
+ &schedlock_set_replay_cmdlist,
+ &schedlock_show_replay_cmdlist,
+ &schedlock_set_cmdlist,
+ &schedlock_show_cmdlist);
+ add_prefix_cmd ("replay", class_run, set_schedlock_replay, _("\
+Scheduler locking settings for replay mode. \
+W/o arguments completely locks the scheduler in replay mode."),
+ &schedlock_set_replay_cmdlist,
+ 0, &schedlock_set_cmdlist);
+
+ add_setshow_boolean_cmd ("run", class_run, &schedlock.replay.run.value, _("\
+Set scheduler locking for non-stepping commands in replay mode."), _("\
+Show scheduler locking for non-stepping commands in replay mode."), _("\
+Controls scheduler locking for non-stepping commands in replay mode.\n\
+Commands include continue, until, finish. The setting does not affect \
+stepping."),
+ set_schedlock_callback,
+ show_schedlock_option,
+ &schedlock_set_replay_cmdlist,
+ &schedlock_show_replay_cmdlist);
+
+ add_setshow_boolean_cmd ("step", class_run, &schedlock.replay.step.value, _("\
+Set scheduler locking for stepping commands in replay mode."), _("\
+Show scheduler locking for stepping commands in replay mode."), _("\
+Controls scheduler locking for stepping commands in replay mode.\n\
+Commands include step, next, stepi, nexti."),
+ set_schedlock_callback,
+ show_schedlock_option,
+ &schedlock_set_replay_cmdlist,
+ &schedlock_show_replay_cmdlist);
+
+/* Commands "set scheduler-locking on" and "set scheduler-locking off"
+ are provided for backward compatibility. */
+ c = add_cmd ("on", class_run, set_schedlock_on, _("\
+[Shortcut] Full locking (no thread except the current thread may run).\n\
+This applies to both normal execution and replay mode."),
+ &schedlock_set_cmdlist);
+
+ c = add_cmd ("off", class_run, set_schedlock_off, _("\
+[Shortcut] No locking (threads may preempt at any time)."),
+ &schedlock_set_cmdlist);
+
add_setshow_boolean_cmd ("schedule-multiple", class_run, &sched_multi, _("\
Set mode for resuming threads of all processes."), _("\
Show mode for resuming threads of all processes."), _("\
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index 4889c31aff3..625a47fb745 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -255,17 +255,12 @@ proc make_cli_in_mi_re { command cli_in_mi_mode mode event inf cli_thread
# Return the current value of the "scheduler-locking" parameter.
proc show_scheduler_locking { } {
- global gdb_prompt
- global expect_out
-
- set any "\[^\r\n\]*"
-
set test "show scheduler-locking"
- gdb_test_multiple $test $test {
- -re ".*Mode for locking scheduler during execution is \"(${any})\".\r\n$gdb_prompt " {
- pass $test
- return $expect_out(1,string)
- }
+ set schedlock [get_scheduler_locking $test]
+
+ if {$schedlock ne "unknown"} {
+ pass $test
+ return $schedlock
}
error "Couldn't get current scheduler-locking value."
@@ -342,7 +337,10 @@ proc test_continue_to_start { mode inf } {
}
# Restore scheduler-locking to its original value.
- gdb_test_no_output "set scheduler-locking $previous_schedlock_val"
+ gdb_test_no_output "set scheduler-locking replay run [lindex $previous_schedlock_val 0]"
+ gdb_test_no_output "set scheduler-locking replay step [lindex $previous_schedlock_val 1]"
+ gdb_test_no_output "set scheduler-locking run [lindex $previous_schedlock_val 2]"
+ gdb_test_no_output "set scheduler-locking step [lindex $previous_schedlock_val 3]"
} else { # $mode == "non-stop"
# Put a thread-specific breakpoint for thread 2 of the current
# inferior. We don't put a breakpoint for thread 3, since we
diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
index 58039ddd30e..d18254910db 100644
--- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -68,7 +68,9 @@ gdb_test "continue" \
# Before we start making hand function calls, turn on scheduler locking.
gdb_test_no_output "set scheduler-locking on" "enable scheduler locking"
-gdb_test "show scheduler-locking" ".* locking scheduler .* is \"on\"." "show scheduler locking on"
+set test "show scheduler-locking on"
+gdb_assert {[get_scheduler_locking $test {"on" "on" "on" "on"}] ne "unknown"} \
+ $test
# Now hand-call a function in each thread, having the function
# stop without returning.
@@ -139,7 +141,9 @@ gdb_test_multiple "maint print dummy-frames" "all dummies popped" {
# Before we resume the full program, turn off scheduler locking.
gdb_test_no_output "set scheduler-locking off" "disable scheduler locking"
-gdb_test "show scheduler-locking" ".* locking scheduler .* is \"off\"." "show scheduler locking off"
+set test "show scheduler-locking off"
+gdb_assert {[get_scheduler_locking $test {"off" "off" "off" "off"}] ne "unknown"} \
+ $test
# Continue one last time, the program should exit normally.
#
diff --git a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
index bd037a02674..69e750fea44 100644
--- a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
+++ b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
@@ -49,8 +49,9 @@ foreach_with_prefix thread {5 4 3} {
gdb_breakpoint [gdb_get_line_number "testmarker01"]
gdb_continue_to_breakpoint "testmarker01"
gdb_test_no_output "set scheduler-locking on"
-gdb_test "show scheduler-locking" \
- "Mode for locking scheduler during execution is \"on\"."
+set test "show scheduler-locking"
+gdb_assert {[get_scheduler_locking $test {"on" "on" "on" "on"}] ne "unknown"} \
+ $test
foreach_with_prefix thread {5 4 3 2 1} {
gdb_test "thread ${thread}" "Switching to .*"
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
index 3c60f6b3478..cf11fd3a0a0 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -94,7 +94,8 @@ proc get_current_thread { description } {
# Make sure we're stopped in the loop, in one of the non-main threads.
proc goto_loop { msg } {
- gdb_breakpoint [concat [gdb_get_line_number "schedlock.exp: main loop"] " if arg != 0"]
+ global srcfile
+ gdb_breakpoint [concat "$srcfile:" [gdb_get_line_number "schedlock.exp: main loop"] " if arg != 0"]
set test "return to loop"
if {$msg != ""} {
@@ -264,16 +265,21 @@ with_test_prefix "schedlock=on: cmd=continue" {
}
# Test stepping/nexting with different modes of scheduler locking.
-proc test_step { schedlock cmd call_function } {
+# Do scheduler-locking off setting before the test if PRESET_SCHEDLOCK_OFF is 1.
+# LOCKED defines whether we expect the thread to be locked. If -1, then
+# determine it first.
+proc test_step { schedlock cmd call_function { preset_schedlock_off 1 } { locked -1 } } {
global NUM
- gdb_test_no_output "set scheduler-locking off"
+ if {$preset_schedlock_off} {
+ gdb_test_no_output "set scheduler-locking off"
+ }
goto_loop ""
set curthread [get_current_thread "before"]
# No need to set to off again. This avoids a duplicate message.
- if {$schedlock != "off"} {
+ if {$preset_schedlock_off && $schedlock != "off"} {
gdb_test_no_output "set scheduler-locking $schedlock"
}
@@ -284,16 +290,17 @@ proc test_step { schedlock cmd call_function } {
step_ten_loops $cmd
- if { $schedlock == "on" || $schedlock == "step" } {
- set locked 1
- } else {
- set locked 0
+ if { $locked == -1 } {
+ if { $schedlock == "on" || $schedlock == "step"} {
+ set locked 1
+ } else {
+ set locked 0
+ }
}
-
check_result $cmd $curthread $before_args $locked
}
-# Test stepping/nexting with different modes of scheduler locking.
+# Test stepping/nexting with different shortcut modes of scheduler locking.
foreach schedlock {"off" "step" "on"} {
with_test_prefix "schedlock=$schedlock" {
with_test_prefix "cmd=step" {
@@ -312,3 +319,55 @@ foreach schedlock {"off" "step" "on"} {
}
}
}
+
+proc test_schedlock_opts {run step} {
+ set test "show scheduler-locking"
+ if {[get_scheduler_locking $test [list "off" "off" $run $step]] eq "unknown"} {
+ fail $test
+ } else {
+ pass $test
+ }
+
+ set locked 0
+ if {$step eq "on"} {
+ set locked 1
+ }
+
+ # Stepping tests.
+ with_test_prefix "cmd=step" {
+ test_step "" "step" 0 0 $locked
+ }
+ with_test_prefix "cmd=next" {
+ foreach call_function {0 1} {
+ with_test_prefix "call_function=$call_function" {
+ test_step "" "next" $call_function 0 $locked
+ }
+ }
+ }
+
+ # Continuing tests.
+ set locked 0
+ if {$run eq "on"} {
+ set locked 1
+ }
+ with_test_prefix "cmd=continue" {
+ # Use whichever we stopped in.
+ set curthread [get_current_thread "before"]
+ set cont_args [get_args "before"]
+ my_continue "continue"
+ check_result "continue" $curthread $cont_args $locked
+ }
+}
+
+gdb_test_no_output "set scheduler-locking off"
+
+# Test different options of scheduler locking.
+foreach run {"off" "on"} {
+ foreach step {"off" "on"} {
+ with_test_prefix "run=$run step=$step" {
+ gdb_test_no_output "set scheduler-locking run $run"
+ gdb_test_no_output "set scheduler-locking step $step"
+ test_schedlock_opts $run $step
+ }
+ }
+}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index eb8f6998b1e..a7c85c2b20a 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -8565,6 +8565,42 @@ gdb_caching_proc gdb_target_symbol_prefix {} {
return $prefix
}
+proc get_scheduler_locking {{test ""} {expected ""}} {
+ global gdb_prompt
+ if {$test eq ""} {
+ set test "reading current scheduler-locking mode"
+ }
+
+ set any "\[^\r\n\]+"
+ set on_off "\(?:on|off\)"
+
+ set i [expr 4 - [llength $expected]]
+ while {$i > 0} {
+ incr i -1
+ lappend expected $on_off
+ }
+ set schedlock_regex \
+ [multi_line \
+ "${any}replay run: +\"\([lindex $expected 0]\)\"${any}non-stepping${any}replay${any}" \
+ "${any}replay step: +\"\([lindex $expected 1]\)\"${any}stepping${any}replay${any}" \
+ "${any}run: +\"\([lindex $expected 2]\)\"${any}non-stepping${any}normal execution${any}" \
+ "${any}step: +\"\([lindex $expected 3]\)\"${any}stepping${any}normal execution${any}"]
+
+ set current_schedule_locking_mode "unknown"
+ gdb_test_multiple "show scheduler-locking" $test {
+ -re -wrap $schedlock_regex {
+ set current_schedule_locking_mode \
+ [list $expect_out(1,string) \
+ $expect_out(2,string) \
+ $expect_out(3,string) \
+ $expect_out(4,string)]
+ }
+ -re -wrap "" {}
+ timeout {}
+ }
+ return $current_schedule_locking_mode
+}
+
# Return 1 if target supports scheduler locking, otherwise return 0.
gdb_caching_proc target_supports_scheduler_locking {} {
@@ -8586,21 +8622,16 @@ gdb_caching_proc target_supports_scheduler_locking {} {
set current_schedule_locking_mode ""
set test "reading current scheduler-locking mode"
- gdb_test_multiple "show scheduler-locking" $test {
- -re "Mode for locking scheduler during execution is \"(\[\^\"\]*)\".*$gdb_prompt" {
- set current_schedule_locking_mode $expect_out(1,string)
- }
- -re "$gdb_prompt $" {
- set supports_schedule_locking 0
- }
- timeout {
- set supports_schedule_locking 0
- }
+ set current_schedule_locking_mode [get_scheduler_locking $test]
+ if { $current_scheduler_locking eq "unknown" } {
+ set supports_schedule_locking 0
}
if { $supports_schedule_locking == -1 } {
set test "checking for scheduler-locking support"
- gdb_test_multiple "set scheduler-locking $current_schedule_locking_mode" $test {
+
+ # Try to set scheduler-locking run.
+ gdb_test_multiple "set scheduler-locking run [lindex $current_schedule_locking_mode 0]" $test {
-re "Target '\[^'\]+' cannot support this command\..*$gdb_prompt $" {
set supports_schedule_locking 0
}
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 6/6] gdb: add eval option to lock the scheduler during infcalls.
2023-12-29 10:41 [PATCH 0/6] Refinement of scheduler-locking settings Natalia Saiapova
` (4 preceding siblings ...)
2023-12-29 10:42 ` [PATCH 5/6] gdb: add commands to control " Natalia Saiapova
@ 2023-12-29 10:42 ` Natalia Saiapova
2023-12-29 12:06 ` Eli Zaretskii
5 siblings, 1 reply; 13+ messages in thread
From: Natalia Saiapova @ 2023-12-29 10:42 UTC (permalink / raw)
To: gdb-patches; +Cc: tankut.baris.aktemur
This adds the following commands to control scheduler-locking for
inferior calls during normal execution:
set scheduler-locking eval (on|off}
show scheduler-locking eval
and during replay mode:
set scheduler-locking replay eval (on|off)
show scheduler-locking replay eval
Note, previously, infcalls were handled with the "run" option.
Now, the "run" option affects only continuing commands, but not
the expression evaluation.
Show scheduler locking:
(gdb) show scheduler-locking
scheduler-locking eval: "off" Scheduler locking for expression evaluation is "off" during normal execution.
scheduler-locking replay eval: "on" Scheduler locking for expression evaluation is "on" during replay mode.
scheduler-locking replay run: "on" Scheduler locking for continuing commands is "on" during replay mode.
scheduler-locking replay step: "on" Scheduler locking for stepping commands is "on" during replay mode.
scheduler-locking run: "off" Scheduler locking for continuing commands is "off" during normal execution.
scheduler-locking step: "off" Scheduler locking for stepping commands is "off" during normal execution.
---
gdb/NEWS | 14 ++-
gdb/doc/gdb.texinfo | 19 ++--
gdb/infrun.c | 98 ++++++++++++++-----
.../gdb.mi/user-selected-context-sync.exp | 10 +-
.../gdb.threads/hand-call-in-threads.exp | 4 +-
.../multiple-successive-infcall.exp | 2 +-
gdb/testsuite/gdb.threads/schedlock.exp | 36 +++++--
gdb/testsuite/lib/gdb.exp | 22 +++--
8 files changed, 144 insertions(+), 61 deletions(-)
diff --git a/gdb/NEWS b/gdb/NEWS
index bdbbadacb89..532179cdca1 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -18,16 +18,20 @@ disassemble
* New commands
-set scheduler-locking replay run | replay step | run | step (on|off)
-show scheduler-locking (replay run | replay step | run | step)
- Extend the scheduler locking settings with a set of set/show
+set scheduler-locking eval | replay eval | replay run | replay step | run | step (on|off)
+show scheduler-locking (eval | replay eval | replay run | replay step | run | step)
+ Extend the scheduler-locking settings with a set of set/show
commands, which can be used individually to control the scheduler during
various commands.
- 'replay run' -- when on, the scheduler is locked during non-stepping
+ 'eval' -- when on, the scheduler is locked during expression evaluation
+ in normal mode.
+ 'replay eval' -- when on, the scheduler is locked during expression
+ evaluation in replay mode.
+ 'replay run' -- when on, the scheduler is locked during continuing
commands in replay mode.
'replay step' -- when on, the scheduler is locked during stepping
commands in replay mode.
- 'run' -- when on, the scheduler is locked during non-stepping commands
+ 'run' -- when on, the scheduler is locked during continuing commands
in normal mode.
'step' -- when on, the scheduler is locked during stepping commands
in normal mode.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 0560b9a5ea7..3eddcc569df 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -7119,10 +7119,18 @@ record mode, and replay mode. The scheduler locking can be set separately
for stepping and non-stepping commands.
@table @code
+@item eval
+When @code{on} the scheduler is locked for expression evaluation during
+normal execution and record modes, such that only the current thread may run.
+
+@item replay eval
+When @code{on} the scheduler is locked for expression evaluation during
+replay mode, such that only the current thread may run.
+
@item replay run
-When @code{on} the scheduler is locked for non-stepping commands during
-replay mode. For commands like @samp{continue}, @samp{until}, @samp{finish},
-or expression evaluation only the current thread may run.
+When @code{on} the scheduler is locked for continuing commands during
+replay mode. For commands like @samp{continue}, @samp{until} or @samp{finish}
+only the current thread may run.
@item replay step
When @code{on} the scheduler is locked for stepping commands during replay
@@ -7131,10 +7139,9 @@ resumed while you are stepping, so that the focus of debugging does not change
unexpectedly.
@item run
-When @code{on} the scheduler is locked for non-stepping commands during
+When @code{on} the scheduler is locked for continuing commands during
normal execution and record modes. For commands like @samp{continue},
-@samp{until}, @samp{finish}, or expression evaluation only the current
-thread may run.
+@samp{until}, or @samp{finish} only the current thread may run.
@item step
When @code{on} the scheduler is locked for stepping commands during
diff --git a/gdb/infrun.c b/gdb/infrun.c
index daf8cecd601..67412c7148b 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -110,12 +110,12 @@ static bool step_over_info_valid_p (void);
static bool schedlock_applies_to_thread (thread_info *tp);
-static bool schedlock_applies (bool step);
+static bool schedlock_applies (bool step, thread_info *tp = nullptr);
struct schedlock_options;
static bool schedlock_applies_to_opts (const schedlock_options &opts,
- bool step);
+ bool step, thread_info *tp = nullptr);
/* Command lists for the scheduler locking. */
static cmd_list_element *schedlock_set_cmdlist;
@@ -2361,8 +2361,8 @@ struct schedlock_options
};
schedlock_options () = delete;
- schedlock_options (option run, option step)
- : run (std::move (run)), step (std::move (step))
+ schedlock_options (option eval, option run, option step)
+ : eval (std::move (eval)), run (std::move (run)), step (std::move (step))
{}
/* Forbid accidential copying. */
@@ -2371,7 +2371,9 @@ struct schedlock_options
schedlock_options (schedlock_options &&) = default;
schedlock_options &operator= (schedlock_options &&) = default;
- /* If true, the scheduler is locked during non-stepping. */
+ /* If true, the scheduler is locked during inferior calls. */
+ option eval;
+ /* If true, the scheduler is locked during continuing. */
option run;
/* If true, the scheduler is locked during stepping. */
option step;
@@ -2406,8 +2408,18 @@ static const char schedlock_on[] = "on";
static const char schedlock_step[] = "step";
static const char schedlock_replay[] = "replay";
-schedlock schedlock {{{"run", false}, {"step", false}},
- {{"replay run", true}, {"replay step", true}}};
+schedlock schedlock {
+ {
+ {"eval", false},
+ {"run", false},
+ {"step", false}
+ },
+ {
+ {"replay eval", true},
+ {"replay run", true},
+ {"replay step", true}
+ }
+};
/* A helper function to set scheduler locking shortcuts:
set scheduler-locking on: all options are on.
@@ -2427,9 +2439,11 @@ set_schedlock_shortcut_option (const char *shortcut)
bool any_changed = schedlock.normal.run.set (is_on);
any_changed = schedlock.normal.step.set (is_on || is_step) || any_changed;
+ any_changed = schedlock.normal.eval.set (is_on) || any_changed;
any_changed = schedlock.replay.run.set (is_on || is_replay) || any_changed;
any_changed = schedlock.replay.step.set (is_on || is_replay || is_step)
|| any_changed;
+ any_changed = schedlock.replay.eval.set (is_on || is_replay) || any_changed;
/* If at least one parameter has changed, notify the observer
in the old-fashioned way. */
@@ -2502,7 +2516,9 @@ show_schedlock_option (ui_file *file, int from_tty,
if (strcmp (c->name, "step") == 0)
type = "stepping commands";
else if (strcmp (c->name, "run") == 0)
- type = "non-stepping commands";
+ type = "continuing commands";
+ else if (strcmp (c->name, "eval") == 0)
+ type = "expression evaluation";
else
gdb_assert_not_reached ("Unexpected command name.");
@@ -2538,6 +2554,9 @@ ptid_t
user_visible_resume_ptid (int step)
{
ptid_t resume_ptid;
+ thread_info *tp = nullptr;
+ if (inferior_ptid != null_ptid)
+ tp = inferior_thread ();
if (non_stop)
{
@@ -2545,7 +2564,7 @@ user_visible_resume_ptid (int step)
individually. */
resume_ptid = inferior_ptid;
}
- else if (schedlock_applies (step))
+ else if (schedlock_applies (step, tp))
{
/* User-settable 'scheduler' mode requires solo thread
resume. */
@@ -3334,13 +3353,20 @@ thread_still_needs_step_over (struct thread_info *tp)
/* Return true if OPTS lock the scheduler.
STEP indicates whether a thread is about to step.
+ While the stepping info we take from STEP argument, the inferior call
+ state we get from the thread TP.
Note, this does not take into the account the mode (replay or
normal execution). */
static bool
-schedlock_applies_to_opts (const schedlock_options &opts, bool step)
+schedlock_applies_to_opts (const schedlock_options &opts, bool step,
+ thread_info *tp)
{
- return ((opts.run && !step) || (opts.step && step));
+ bool in_infcall = (tp != nullptr) && tp->control.in_infcall;
+
+ return ((opts.run && !step && !in_infcall)
+ || (opts.step && step)
+ || (opts.eval && in_infcall));
}
/* Returns true if scheduler locking applies to TP. */
@@ -3349,19 +3375,19 @@ static bool
schedlock_applies_to_thread (thread_info *tp)
{
bool step = (tp != nullptr) && tp->control.stepping_command;
- return schedlock_applies (step);
+ return schedlock_applies (step, tp);
}
-/* Returns true if scheduler locking applies. STEP indicates whether
- we're about to do a step/next-like command. */
+/* Returns true if scheduler locking applies to thread TP.
+ STEP indicates whether we're about to do a step/next-like command. */
static bool
-schedlock_applies (bool step)
+schedlock_applies (bool step, thread_info *tp)
{
bool is_replay = target_record_will_replay (minus_one_ptid,
execution_direction);
schedlock_options &opts = is_replay ? schedlock.replay : schedlock.normal;
- return schedlock_applies_to_opts (opts, step);
+ return schedlock_applies_to_opts (opts, step, tp);
}
/* Set process_stratum_target::COMMIT_RESUMED_STATE in all target
@@ -10710,12 +10736,11 @@ Show scheduler locking settings in various conditions."),
&setlist, &showlist);
add_setshow_boolean_cmd ("run", class_run, &schedlock.normal.run.value, _("\
-Scheduler locking for non-stepping commands during normal execution."), _("\
-Show scheduler locking for non-stepping commands during normal execution."),
- _("\
-Controls scheduler locking for non-stepping commands during normal execution.\n\
-Commands include continue, until, finish. The setting does not affect \
-stepping."),
+Scheduler locking for continuing commands during normal execution."), _("\
+Show scheduler locking for continuing commands during normal execution."), _("\
+Controls scheduler locking for continuing commands during normal execution.\n\
+Commands include continue, until, finish. The setting does not affect\n\
+stepping and expression evaluation."),
set_schedlock_callback,
show_schedlock_option,
&schedlock_set_cmdlist,
@@ -10733,6 +10758,16 @@ Commands include step, next, stepi, nexti."),
&schedlock_set_cmdlist,
&schedlock_show_cmdlist);
+ add_setshow_boolean_cmd ("eval", class_run, &schedlock.normal.eval.value, _("\
+Scheduler locking for expression evaluation during normal execution."), _("\
+Show scheduler locking for expression evaluation during normal execution."),
+ _("\
+Controls scheduler locking for expression evaluation during normal execution."),
+ set_schedlock_callback,
+ show_schedlock_option,
+ &schedlock_set_cmdlist,
+ &schedlock_show_cmdlist);
+
/* Commands for set/show scheduler-locking in replay mode.
The base command adds support for the shortcut
set scheduler-locking replay
@@ -10754,11 +10789,11 @@ W/o arguments completely locks the scheduler in replay mode."),
0, &schedlock_set_cmdlist);
add_setshow_boolean_cmd ("run", class_run, &schedlock.replay.run.value, _("\
-Set scheduler locking for non-stepping commands in replay mode."), _("\
-Show scheduler locking for non-stepping commands in replay mode."), _("\
-Controls scheduler locking for non-stepping commands in replay mode.\n\
-Commands include continue, until, finish. The setting does not affect \
-stepping."),
+Set scheduler locking for continuing commands in replay mode."), _("\
+Show scheduler locking for continuing commands in replay mode."), _("\
+Controls scheduler locking for continuing commands in replay mode.\n\
+Commands include continue, until, finish. The setting does not affect\n\
+stepping and expression evaluation."),
set_schedlock_callback,
show_schedlock_option,
&schedlock_set_replay_cmdlist,
@@ -10774,6 +10809,15 @@ Commands include step, next, stepi, nexti."),
&schedlock_set_replay_cmdlist,
&schedlock_show_replay_cmdlist);
+ add_setshow_boolean_cmd ("eval", class_run, &schedlock.replay.eval.value, _("\
+Set scheduler locking for expression evaluation in replay mode."), _("\
+Show scheduler locking for expression evaluation in replay mode."), _("\
+Controls scheduler locking for expression evaluation in replay mode."),
+ set_schedlock_callback,
+ show_schedlock_option,
+ &schedlock_set_replay_cmdlist,
+ &schedlock_show_replay_cmdlist);
+
/* Commands "set scheduler-locking on" and "set scheduler-locking off"
are provided for backward compatibility. */
c = add_cmd ("on", class_run, set_schedlock_on, _("\
diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
index 625a47fb745..01ab4c016ec 100644
--- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
+++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp
@@ -337,10 +337,12 @@ proc test_continue_to_start { mode inf } {
}
# Restore scheduler-locking to its original value.
- gdb_test_no_output "set scheduler-locking replay run [lindex $previous_schedlock_val 0]"
- gdb_test_no_output "set scheduler-locking replay step [lindex $previous_schedlock_val 1]"
- gdb_test_no_output "set scheduler-locking run [lindex $previous_schedlock_val 2]"
- gdb_test_no_output "set scheduler-locking step [lindex $previous_schedlock_val 3]"
+ gdb_test_no_output "set scheduler-locking eval [lindex $previous_schedlock_val 0]"
+ gdb_test_no_output "set scheduler-locking replay eval [lindex $previous_schedlock_val 1]"
+ gdb_test_no_output "set scheduler-locking replay run [lindex $previous_schedlock_val 2]"
+ gdb_test_no_output "set scheduler-locking replay step [lindex $previous_schedlock_val 3]"
+ gdb_test_no_output "set scheduler-locking run [lindex $previous_schedlock_val 4]"
+ gdb_test_no_output "set scheduler-locking step [lindex $previous_schedlock_val 5]"
} else { # $mode == "non-stop"
# Put a thread-specific breakpoint for thread 2 of the current
# inferior. We don't put a breakpoint for thread 3, since we
diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
index d18254910db..e0083a6369c 100644
--- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
+++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp
@@ -69,7 +69,7 @@ gdb_test "continue" \
gdb_test_no_output "set scheduler-locking on" "enable scheduler locking"
set test "show scheduler-locking on"
-gdb_assert {[get_scheduler_locking $test {"on" "on" "on" "on"}] ne "unknown"} \
+gdb_assert {[get_scheduler_locking $test {"on" "on" "on" "on" "on" "on"}] ne "unknown"} \
$test
# Now hand-call a function in each thread, having the function
@@ -142,7 +142,7 @@ gdb_test_multiple "maint print dummy-frames" "all dummies popped" {
# Before we resume the full program, turn off scheduler locking.
gdb_test_no_output "set scheduler-locking off" "disable scheduler locking"
set test "show scheduler-locking off"
-gdb_assert {[get_scheduler_locking $test {"off" "off" "off" "off"}] ne "unknown"} \
+gdb_assert {[get_scheduler_locking $test {"off" "off" "off" "off" "off" "off"}] ne "unknown"} \
$test
# Continue one last time, the program should exit normally.
diff --git a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
index 69e750fea44..75387883301 100644
--- a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
+++ b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
@@ -50,7 +50,7 @@ gdb_breakpoint [gdb_get_line_number "testmarker01"]
gdb_continue_to_breakpoint "testmarker01"
gdb_test_no_output "set scheduler-locking on"
set test "show scheduler-locking"
-gdb_assert {[get_scheduler_locking $test {"on" "on" "on" "on"}] ne "unknown"} \
+gdb_assert {[get_scheduler_locking $test {"on" "on" "on" "on" "on" "on"}] ne "unknown"} \
$test
foreach_with_prefix thread {5 4 3 2 1} {
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
index cf11fd3a0a0..c77aae98864 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -228,7 +228,7 @@ proc check_result { cmd before_thread before_args locked } {
set num_other_threads 0
for {set i 0} {$i < $NUM} {incr i} {
if {[lindex $before_args $i] == [lindex $after_args $i]} {
- if {$i == $before_thread} {
+ if {$i == $before_thread && $cmd ne "infcall"} {
fail "$test (didn't run)"
}
} else {
@@ -320,9 +320,9 @@ foreach schedlock {"off" "step" "on"} {
}
}
-proc test_schedlock_opts {run step} {
+proc test_schedlock_opts {eval run step} {
set test "show scheduler-locking"
- if {[get_scheduler_locking $test [list "off" "off" $run $step]] eq "unknown"} {
+ if {[get_scheduler_locking $test [list $eval "off" "off" "off" $run $step]] eq "unknown"} {
fail $test
} else {
pass $test
@@ -357,6 +357,25 @@ proc test_schedlock_opts {run step} {
my_continue "continue"
check_result "continue" $curthread $cont_args $locked
}
+
+ # Infcall tests.
+ set locked 0
+ if {$eval eq "on"} {
+ set locked 1
+ }
+ with_test_prefix "cmd=infcall" {
+ # Use whichever we stopped in.
+ set curthread [get_current_thread "before-infcall"]
+ set cont_args [get_args "before-infcall"]
+
+ for {set i 0} {[expr $i < 10]} {set i [expr $i + 1]} {
+ with_test_prefix "infcall #$i" {
+ gdb_test "print some_function()" ".*"
+ }
+ }
+
+ check_result "infcall" $curthread $cont_args $locked
+ }
}
gdb_test_no_output "set scheduler-locking off"
@@ -364,10 +383,13 @@ gdb_test_no_output "set scheduler-locking off"
# Test different options of scheduler locking.
foreach run {"off" "on"} {
foreach step {"off" "on"} {
- with_test_prefix "run=$run step=$step" {
- gdb_test_no_output "set scheduler-locking run $run"
- gdb_test_no_output "set scheduler-locking step $step"
- test_schedlock_opts $run $step
+ foreach eval {"off" "on"} {
+ with_test_prefix "run=$run step=$step eval=$eval" {
+ gdb_test_no_output "set scheduler-locking eval $eval"
+ gdb_test_no_output "set scheduler-locking run $run"
+ gdb_test_no_output "set scheduler-locking step $step"
+ test_schedlock_opts $eval $run $step
+ }
}
}
}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index a7c85c2b20a..4120e2125f4 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -8574,17 +8574,19 @@ proc get_scheduler_locking {{test ""} {expected ""}} {
set any "\[^\r\n\]+"
set on_off "\(?:on|off\)"
- set i [expr 4 - [llength $expected]]
+ set i [expr 6 - [llength $expected]]
while {$i > 0} {
incr i -1
lappend expected $on_off
}
set schedlock_regex \
[multi_line \
- "${any}replay run: +\"\([lindex $expected 0]\)\"${any}non-stepping${any}replay${any}" \
- "${any}replay step: +\"\([lindex $expected 1]\)\"${any}stepping${any}replay${any}" \
- "${any}run: +\"\([lindex $expected 2]\)\"${any}non-stepping${any}normal execution${any}" \
- "${any}step: +\"\([lindex $expected 3]\)\"${any}stepping${any}normal execution${any}"]
+ "${any}eval: +\"\([lindex $expected 0]\)\"${any}expression evaluation${any}normal execution${any}" \
+ "${any}replay eval: +\"\([lindex $expected 1]\)\"${any}expression evaluation${any}replay${any}" \
+ "${any}replay run: +\"\([lindex $expected 2]\)\"${any}continuing${any}replay${any}" \
+ "${any}replay step: +\"\([lindex $expected 3]\)\"${any}stepping${any}replay${any}" \
+ "${any}run: +\"\([lindex $expected 4]\)\"${any}continuing${any}normal execution${any}" \
+ "${any}step: +\"\([lindex $expected 5]\)\"${any}stepping${any}normal execution${any}"]
set current_schedule_locking_mode "unknown"
gdb_test_multiple "show scheduler-locking" $test {
@@ -8593,7 +8595,9 @@ proc get_scheduler_locking {{test ""} {expected ""}} {
[list $expect_out(1,string) \
$expect_out(2,string) \
$expect_out(3,string) \
- $expect_out(4,string)]
+ $expect_out(4,string) \
+ $expect_out(5,string) \
+ $expect_out(6,string)]
}
-re -wrap "" {}
timeout {}
@@ -8623,15 +8627,15 @@ gdb_caching_proc target_supports_scheduler_locking {} {
set test "reading current scheduler-locking mode"
set current_schedule_locking_mode [get_scheduler_locking $test]
- if { $current_scheduler_locking eq "unknown" } {
+ if { $current_schedule_locking_mode eq "unknown" } {
set supports_schedule_locking 0
}
if { $supports_schedule_locking == -1 } {
set test "checking for scheduler-locking support"
- # Try to set scheduler-locking run.
- gdb_test_multiple "set scheduler-locking run [lindex $current_schedule_locking_mode 0]" $test {
+ # Try to set scheduler-locking eval.
+ gdb_test_multiple "set scheduler-locking eval [lindex $current_schedule_locking_mode 0]" $test {
-re "Target '\[^'\]+' cannot support this command\..*$gdb_prompt $" {
set supports_schedule_locking 0
}
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/6] gdb: change the internal representation of scheduler locking.
2023-12-29 10:42 ` [PATCH 4/6] gdb: change the internal representation of scheduler locking Natalia Saiapova
@ 2023-12-29 11:49 ` Eli Zaretskii
0 siblings, 0 replies; 13+ messages in thread
From: Eli Zaretskii @ 2023-12-29 11:49 UTC (permalink / raw)
To: Natalia Saiapova; +Cc: gdb-patches, tankut.baris.aktemur
> From: Natalia Saiapova <natalia.saiapova@intel.com>
> Cc: tankut.baris.aktemur@intel.com
> Date: Fri, 29 Dec 2023 10:42:00 +0000
>
> Introduce a new structure to manage different options of the scheduler
> locking. The options can coexist together and be set individually.
> In the next patch
>
> gdb: add commands to control scheduler locking.
>
> we introduce the commands to control these options. In this patch we do
> not introduce new commands and keep the previous API.
>
> New scheduler locking options are:
> replay run -- control non-stepping commands during replay mode.
> replay step -- control stepping commands during replay mode.
> run -- control non-stepping commands during normal exection.
> step -- control stepping commands during normal exection.
To make this easier to remember, I suggest to use "non-step" instead
of "run", in both cases.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 5/6] gdb: add commands to control scheduler locking.
2023-12-29 10:42 ` [PATCH 5/6] gdb: add commands to control " Natalia Saiapova
@ 2023-12-29 12:03 ` Eli Zaretskii
0 siblings, 0 replies; 13+ messages in thread
From: Eli Zaretskii @ 2023-12-29 12:03 UTC (permalink / raw)
To: Natalia Saiapova; +Cc: gdb-patches, tankut.baris.aktemur
> From: Natalia Saiapova <natalia.saiapova@intel.com>
> Cc: tankut.baris.aktemur@intel.com
> Date: Fri, 29 Dec 2023 10:42:01 +0000
>
> --- a/gdb/NEWS
> +++ b/gdb/NEWS
> @@ -18,6 +18,23 @@ disassemble
>
> * New commands
>
> +set scheduler-locking replay run | replay step | run | step (on|off)
> +show scheduler-locking (replay run | replay step | run | step)
> + Extend the scheduler locking settings with a set of set/show
> + commands, which can be used individually to control the scheduler during
> + various commands.
> + 'replay run' -- when on, the scheduler is locked during non-stepping
> + commands in replay mode.
> + 'replay step' -- when on, the scheduler is locked during stepping
> + commands in replay mode.
> + 'run' -- when on, the scheduler is locked during non-stepping commands
> + in normal mode.
> + 'step' -- when on, the scheduler is locked during stepping commands
> + in normal mode.
> + The older scheduler locking settings can be used as shortcuts, their behavior
> + is not changed.
> + The output of "show scheduler-locking" has changed to support the new settings.
> +
I suggest to mention a couple of examples of non-stepping commands
where these settings are relevant.
> --- a/gdb/doc/gdb.texinfo
> +++ b/gdb/doc/gdb.texinfo
> @@ -7110,22 +7110,56 @@ On some OSes, you can modify @value{GDBN}'s default behavior by
> locking the OS scheduler to allow only a single thread to run.
>
> @table @code
> -@item set scheduler-locking @var{mode}
> -@cindex scheduler-locking
> +
> +@item set scheduler-locking @var{type} [@code{on}|@code{off}]
> +@cindex scheduler locking type
> +@cindex lock scheduler
> +Set the scheduler locking settings. It applies to normal execution,
> +record mode, and replay mode. The scheduler locking can be set separately
> +for stepping and non-stepping commands.
Similarly here. In the manual, it is actually much more important,
since the manual is supposed to be the ultimate source of information
about GDB commands: after reading the relevant parts of the manual,
the user is supposed to understand the command enough to be able to
use it intelligently and correctly.
> +@table @code
> +@item replay run
> +When @code{on} the scheduler is locked for non-stepping commands during
^
A comma is missing there.
> +replay mode. For commands like @samp{continue}, @samp{until}, @samp{finish},
> +or expression evaluation only the current thread may run.
The last sentence should IMO be moved to where you say "non-stepping
commands" above, because it actually explains what are those commands.
Btw, I'm a bit worried about our use of "scheduler lock", with the
meaning of "prevent other threads from running". We never say that
locking the scheduler means only the current thread is allowed to run,
we rely on the readers to figure that out on their own. (Yes, I
understand that this was the problem with the original text as well.)
> +@item replay step
> +When @code{on} the scheduler is locked for stepping commands during replay
> +mode. This mode optimizes for single-stepping; only the current thread is
> +resumed while you are stepping, so that the focus of debugging does not change
> +unexpectedly.
> +
> +@item run
> +When @code{on} the scheduler is locked for non-stepping commands during
> +normal execution and record modes. For commands like @samp{continue},
> +@samp{until}, @samp{finish}, or expression evaluation only the current
> +thread may run.
> +
> +@item step
> +When @code{on} the scheduler is locked for stepping commands during
> +normal execution and record modes. This mode optimizes for single-stepping;
> +only the current thread is resumed while you are stepping, so that the focus
> +of debugging does not change unexpectedly.
> +
> +@end table
The above description lost the information about the default setting.
To understand what is the default, the reader needs to read further,
where you describe the old settings ("shortcuts") and their
equivalence to the new one; this is sub-optimal.
> -Only the current thread may run when the inferior is resumed. New
> +Only the current thread may run when the inferior is resumed. New
^^^
Redundant whitespace there.
Thanks.
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/6] gdb: add eval option to lock the scheduler during infcalls.
2023-12-29 10:42 ` [PATCH 6/6] gdb: add eval option to lock the scheduler during infcalls Natalia Saiapova
@ 2023-12-29 12:06 ` Eli Zaretskii
0 siblings, 0 replies; 13+ messages in thread
From: Eli Zaretskii @ 2023-12-29 12:06 UTC (permalink / raw)
To: Natalia Saiapova; +Cc: gdb-patches, tankut.baris.aktemur
> From: Natalia Saiapova <natalia.saiapova@intel.com>
> Cc: tankut.baris.aktemur@intel.com
> Date: Fri, 29 Dec 2023 10:42:02 +0000
>
> diff --git a/gdb/NEWS b/gdb/NEWS
> index bdbbadacb89..532179cdca1 100644
> --- a/gdb/NEWS
> +++ b/gdb/NEWS
> @@ -18,16 +18,20 @@ disassemble
>
> * New commands
>
> -set scheduler-locking replay run | replay step | run | step (on|off)
> -show scheduler-locking (replay run | replay step | run | step)
> - Extend the scheduler locking settings with a set of set/show
> +set scheduler-locking eval | replay eval | replay run | replay step | run | step (on|off)
> +show scheduler-locking (eval | replay eval | replay run | replay step | run | step)
> + Extend the scheduler-locking settings with a set of set/show
> commands, which can be used individually to control the scheduler during
> various commands.
> - 'replay run' -- when on, the scheduler is locked during non-stepping
> + 'eval' -- when on, the scheduler is locked during expression evaluation
> + in normal mode.
Doesn't this affect only expression evaluation that calls functions in
the inferior? That is, commands like "print 2+2" will not be
affected, right? If I'm right, this should be mentioned in the
documentation.
Thanks.
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/6] gdb, cli: pass the argument of a set command to its callback.
2023-12-29 10:41 ` [PATCH 3/6] gdb, cli: pass the argument of a set command to its callback Natalia Saiapova
@ 2024-02-08 18:45 ` Tom Tromey
0 siblings, 0 replies; 13+ messages in thread
From: Tom Tromey @ 2024-02-08 18:45 UTC (permalink / raw)
To: Natalia Saiapova; +Cc: gdb-patches, tankut.baris.aktemur
>>>>> "Natalia" == Natalia Saiapova <natalia.saiapova@intel.com> writes:
Natalia> This might be useful, if some commands need to have a special case if
Natalia> run w/o arguments.
Do you have an example of this?
I wonder if this is really something we want to allow.
Natalia> diff --git a/gdb/infrun.c b/gdb/infrun.c
Natalia> index e10bde94744..b8feef6bc2d 100644
Natalia> --- a/gdb/infrun.c
Natalia> +++ b/gdb/infrun.c
Natalia> @@ -2385,9 +2385,6 @@ ptid_t
Natalia> user_visible_resume_ptid (int step)
Natalia> {
Natalia> ptid_t resume_ptid;
Natalia> - thread_info *tp = nullptr;
Natalia> - if (inferior_ptid != null_ptid)
Natalia> - tp = inferior_thread ();
This seems to be an unrelated change.
Tom
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/6] gdb: use schedlock_applies in user_visible_resume_ptid.
2023-12-29 10:41 ` [PATCH 1/6] gdb: use schedlock_applies in user_visible_resume_ptid Natalia Saiapova
@ 2024-02-08 18:50 ` Tom Tromey
0 siblings, 0 replies; 13+ messages in thread
From: Tom Tromey @ 2024-02-08 18:50 UTC (permalink / raw)
To: Natalia Saiapova; +Cc: gdb-patches, tankut.baris.aktemur
>>>>> "Natalia" == Natalia Saiapova <natalia.saiapova@intel.com> writes:
Natalia> This is a refactoring. The logic in user_visible_resume_ptid is very
Natalia> similar to schedlock_applies, but uses `step` parameter instead of
Natalia> `tp->control.stepping_command`.
Natalia> Refactor schedlock_applies logic into the following two methods:
Natalia> bool schedlock_applies_to_thread (thread_info *tp)
Natalia> and
Natalia> bool schedlock_applies (bool step)
Natalia> such that they share the logic.
Natalia> Update the call-sites accordingly, where we have only the thread, use
Natalia> the former, and where we have the bool step, use the latter.
Thank you for the patch.
Natalia> +static bool schedlock_applies_to_thread (thread_info *tp);
Natalia> +
Natalia> +static bool schedlock_applies (bool step);
I don't mind separate names for these, but at the same time overloading
seems fine and would make the patch smaller.
Natalia> user_visible_resume_ptid (int step)
Natalia> {
Natalia> ptid_t resume_ptid;
Natalia> + thread_info *tp = nullptr;
Natalia> + if (inferior_ptid != null_ptid)
Natalia> + tp = inferior_thread ();
This doesn't seem to be used in this function.
Tom
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/6] gdb, cli: remove left-over code from "set_logging_on".
2023-12-29 10:41 ` [PATCH 2/6] gdb, cli: remove left-over code from "set_logging_on" Natalia Saiapova
@ 2024-02-08 18:50 ` Tom Tromey
0 siblings, 0 replies; 13+ messages in thread
From: Tom Tromey @ 2024-02-08 18:50 UTC (permalink / raw)
To: Natalia Saiapova; +Cc: gdb-patches, tankut.baris.aktemur
>>>>> "Natalia" == Natalia Saiapova <natalia.saiapova@intel.com> writes:
Natalia> This is a refactoring. Remove the left-over code, which rewrites
Natalia> the logging filename in "set logging on" command.
Thank you. This is ok.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-02-08 18:50 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-29 10:41 [PATCH 0/6] Refinement of scheduler-locking settings Natalia Saiapova
2023-12-29 10:41 ` [PATCH 1/6] gdb: use schedlock_applies in user_visible_resume_ptid Natalia Saiapova
2024-02-08 18:50 ` Tom Tromey
2023-12-29 10:41 ` [PATCH 2/6] gdb, cli: remove left-over code from "set_logging_on" Natalia Saiapova
2024-02-08 18:50 ` Tom Tromey
2023-12-29 10:41 ` [PATCH 3/6] gdb, cli: pass the argument of a set command to its callback Natalia Saiapova
2024-02-08 18:45 ` Tom Tromey
2023-12-29 10:42 ` [PATCH 4/6] gdb: change the internal representation of scheduler locking Natalia Saiapova
2023-12-29 11:49 ` Eli Zaretskii
2023-12-29 10:42 ` [PATCH 5/6] gdb: add commands to control " Natalia Saiapova
2023-12-29 12:03 ` Eli Zaretskii
2023-12-29 10:42 ` [PATCH 6/6] gdb: add eval option to lock the scheduler during infcalls Natalia Saiapova
2023-12-29 12:06 ` Eli Zaretskii
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).