[RFC 3/5] Add -FLAGS... argument to thread apply

Philippe Waroquiers
2018-05-05T19:28:27Z

Also implements 2 new commands:
taas COMMAND
shortcut for 'thread apply all -s COMMAND'
tfaas COMMAND
shortcut for 'thread apply all -s frame apply all -s COMMAND'
---
gdb/thread.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 108 insertions(+), 20 deletions(-)

diff --git a/gdb/thread.c b/gdb/thread.c
index a09d7e0ba0..2fa075d4b1 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -1581,6 +1581,41 @@ tp_array_compar (const thread_info *a, const thread_info *b)
return (a->per_inf_num > b->per_inf_num);
}

+static void
+thr_try_catch_cmd (thread_info *thr, const char *cmd, int from_tty,
+ int print_what_v,
+ bool cont, bool silent)
+{
+ switch_to_thread (thr->ptid);
+ TRY
+ {
+ std::string cmd_result = execute_command_to_string (cmd, from_tty);
+ if (!silent || cmd_result.length() > 0)
+ {
+ if (print_what_v > 0)
+ printf_filtered (_("\nThread %s (%s):\n"),
+ print_thread_id (thr),
+ target_pid_to_str (inferior_ptid));
+ printf_filtered ("%s", cmd_result.c_str ());
+ }
+ }
+ CATCH (ex, RETURN_MASK_ERROR)
+ {
+ if (!silent)
+ {
+ if (print_what_v > 0)
+ printf_filtered (_("\nThread %s (%s):\n"),
+ print_thread_id (thr),
+ target_pid_to_str (inferior_ptid));
+ if (cont)
+ printf_filtered ("%s\n", ex.message);
+ else
+ throw_exception (ex);
+ }
+ }
+ END_CATCH;
+}
+
/* Apply a GDB command to a list of threads. List syntax is a whitespace
separated list of numbers, or ranges, or the keyword `all'. Ranges consist
of two numbers separated by a hyphen. Examples:
@@ -1592,6 +1627,10 @@ tp_array_compar (const thread_info *a, const thread_info *b)
static void
thread_apply_all_command (const char *cmd, int from_tty)
{
+ int print_what_v = 1; /* Print thread id/thread/lwp. */
+ bool cont;
+ bool silent;
+
tp_array_compar_ascending = false;
if (cmd != NULL
&& check_for_argument (&cmd, "-ascending", strlen ("-ascending")))
@@ -1600,8 +1639,13 @@ thread_apply_all_command (const char *cmd, int from_tty)
tp_array_compar_ascending = true;
}

+ if (cmd != NULL)
+ check_for_flags_vqcs ("thread apply all", &cmd,
+ &print_what_v, 1,
+ &cont, &silent);
+
if (cmd == NULL || *cmd == '\000')
- error (_("Please specify a command following the thread ID list"));
+ error (_("Please specify a command at the end of thread apply all"));

update_thread_list ();

@@ -1637,14 +1681,9 @@ thread_apply_all_command (const char *cmd, int from_tty)

for (thread_info *thr : thr_list_cpy)
if (thread_alive (thr))
- {
- switch_to_thread (thr->ptid);
- printf_filtered (_("\nThread %s (%s):\n"),
- print_thread_id (thr),
- target_pid_to_str (inferior_ptid));
-
- execute_command (cmd, from_tty);
- }
+ thr_try_catch_cmd (thr, cmd, from_tty,
+ print_what_v,
+ cont, silent);
}
}

@@ -1653,7 +1692,11 @@ thread_apply_all_command (const char *cmd, int from_tty)
static void
thread_apply_command (const char *tidlist, int from_tty)
{
+ int print_what_v = 1; /* Print thread id/thread/lwp. */
+ bool cont;
+ bool silent;
const char *cmd = NULL;
+ const char *cmd_or_flags;
tid_range_parser parser;

if (tidlist == NULL || *tidlist == '\000')
@@ -1671,6 +1714,12 @@ thread_apply_command (const char *tidlist, int from_tty)
}
}

+ cmd_or_flags = cmd;
+ if (cmd != NULL)
+ check_for_flags_vqcs ("thread apply", &cmd,
+ &print_what_v, 1,
+ &cont, &silent);
+
if (cmd == NULL)
error (_("Please specify a command following the thread ID list"));

@@ -1680,7 +1729,7 @@ thread_apply_command (const char *tidlist, int from_tty)
scoped_restore_current_thread restore_thread;

parser.init (tidlist, current_inferior ()->num);
- while (!parser.finished () && parser.cur_tok () < cmd)
+ while (!parser.finished () && parser.cur_tok () < cmd_or_flags)
{
struct thread_info *tp = NULL;
struct inferior *inf;
@@ -1725,14 +1774,31 @@ thread_apply_command (const char *tidlist, int from_tty)
continue;
}

- switch_to_thread (tp->ptid);
-
- printf_filtered (_("\nThread %s (%s):\n"), print_thread_id (tp),
- target_pid_to_str (inferior_ptid));
- execute_command (cmd, from_tty);
+ thr_try_catch_cmd (tp, cmd, from_tty,
+ print_what_v,
+ cont, silent);
}
}

+
+/* Implementation of the "taas" command. */
+
+static void
+taas_command (const char *cmd, int from_tty)
+{
+ std::string expanded = std::string ("thread apply all -s ") + std::string (cmd);
+ execute_command (expanded.c_str (), from_tty);
+}
+
+/* Implementation of the "tfaas" command. */
+
+static void
+tfaas_command (const char *cmd, int from_tty)
+{
+ std::string expanded = std::string ("thread apply all -s frame apply all -s ") + std::string (cmd);
+ execute_command (expanded.c_str (), from_tty);
+}
+
/* Switch to the specified thread, or print the current thread. */

void
@@ -2027,22 +2093,44 @@ Use this command to switch between threads.\n\
The new thread ID must be currently known."),
&thread_cmd_list, "thread ", 1, &cmdlist);

+#define THREAD_APPLY_FLAGS_HELP "\
+FLAGS letters are v(increase verbosity), q(decrease verbosity)\n\
+ c(continue), s(silent).\n\
+Verbosity (default 1) controls what to print for a thread:\n\
+ 0 : no thread info is printed\n\
+ 1 : print per-inferior thread number and target system's thread id\n\
+By default, if a COMMAND raises an error, thread apply is aborted.\n\
+Flag c indicates to print the error and continue.\n\
+Flag s indicates to silently ignore a COMMAND that raises an error\n\
+or produces no output."
+
add_prefix_cmd ("apply", class_run, thread_apply_command,
_("Apply a command to a list of threads.\n\
-Usage: thread apply ID... COMMAND\n\
-ID is a space-separated list of IDs of threads to apply COMMAND on."),
+Usage: thread apply ID... [-FLAGS...] COMMAND\n\
+ID is a space-separated list of IDs of threads to apply COMMAND on.\n"
+THREAD_APPLY_FLAGS_HELP),
&thread_apply_list, "thread apply ", 1, &thread_cmd_list);

add_cmd ("all", class_run, thread_apply_all_command,
_("\
Apply a command to all threads.\n\
\n\
-Usage: thread apply all [-ascending] COMMAND\n\
+Usage: thread apply all [-ascending] [-FLAGS...] COMMAND\n\
-ascending: Call COMMAND for all threads in ascending order.\n\
- The default is descending order.\
-"),
+ The default is descending order.\n"
+THREAD_APPLY_FLAGS_HELP),
&thread_apply_list);

+ add_com ("taas", class_run, taas_command, _("\
+Apply a command to all threads (ignoring errors and empty output)\n\
+Usage: taas COMMAND\n\
+shortcut for 'thread apply all -s COMMAND'"));
+
+ add_com ("tfaas", class_run, tfaas_command, _("\
+Apply a command to all frames of all threads (ignoring errors and empty output)\n\
+Usage: tfaas COMMAND\n\
+shortcut for 'thread apply all -s frame apply all -s COMMAND'"));
+
add_cmd ("name", class_run, thread_name_command,
_("Set the current thread's name.\n\
Usage: thread name [NAME]\n\
--
2.11.0