From patchwork Tue Jun 5 20:49:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 27645 Received: (qmail 86738 invoked by alias); 5 Jun 2018 20:49:51 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 86132 invoked by uid 89); 5 Jun 2018 20:49:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=philippe.waroquiers@skynet.be, D*be, U*philippe.waroquiers, philippewaroquiersskynetbe X-HELO: mailsec118.isp.belgacom.be Received: from mailsec118.isp.belgacom.be (HELO mailsec118.isp.belgacom.be) (195.238.20.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 05 Jun 2018 20:49:32 +0000 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2BTCgBz9hZb/2wz8VFcHQEBBQELAYNDZ?= =?us-ascii?q?2gSKIxbjBABgikBQ5NYgXgLKwGEQAKCHyI2FgECAQEBAQEBAgFrKEIQAYFiIoJ?= =?us-ascii?q?SBicvIxA/EjkeGRmDCYIFqTkzhFiDaoFoihY/gQ+CV4p8AocmhQyBI4sfBwKBZ?= =?us-ascii?q?4ZfhhcLgT2DeIdrK4c6iUGBSAgpgVJtU4JDgiAXjhk9MHgBGgGCTYtoAQE?= X-IPAS-Result: =?us-ascii?q?A2BTCgBz9hZb/2wz8VFcHQEBBQELAYNDZ2gSKIxbjBABgik?= =?us-ascii?q?BQ5NYgXgLKwGEQAKCHyI2FgECAQEBAQEBAgFrKEIQAYFiIoJSBicvIxA/EjkeG?= =?us-ascii?q?RmDCYIFqTkzhFiDaoFoihY/gQ+CV4p8AocmhQyBI4sfBwKBZ4ZfhhcLgT2DeId?= =?us-ascii?q?rK4c6iUGBSAgpgVJtU4JDgiAXjhk9MHgBGgGCTYtoAQE?= Received: from 108.51-241-81.adsl-dyn.isp.belgacom.be (HELO md.home) ([81.241.51.108]) by relay.skynet.be with ESMTP/TLS/DHE-RSA-AES128-GCM-SHA256; 05 Jun 2018 22:49:23 +0200 From: Philippe Waroquiers To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [RFA_v2 3/8] Add FLAGS... arguments to 'thread apply'. Date: Tue, 5 Jun 2018 22:49:00 +0200 Message-Id: <20180605204905.30612-4-philippe.waroquiers@skynet.be> In-Reply-To: <20180605204905.30612-1-philippe.waroquiers@skynet.be> References: <20180605204905.30612-1-philippe.waroquiers@skynet.be> X-IsSubscribed: yes Enhance 'thread apply' command to also accepts FLAGS... arguments. Some examples usages for this new argument: thread apply all -s frame apply all -s p some_local_var_somewhere Prints the thread id, frame location and some_local_var_somewhere value in frames of threads that have such local var. To make the life of the user easier, the most typical use cases have shortcuts : taas : shortcut for 'thread apply all -s' tfaas : shortcut for 'thread apply all -s frame apply all -s" An example usage : tfaas p some_local_var_somewhere same as the longer: 'thread apply all -s frame apply all -s p some_local_var_somewhere' gdb/ChangeLog 2018-05-21 Philippe Waroquiers * thread.c (thr_try_catch_cmd): New function. (thread_apply_all_command): Handle vqcs flags. (thread_apply_command): Handle vqcs flags. (taas_command): New function. (tfaas_command): New function. (_initialize_thread): Update to setup the new commands 'taas and 'tfaas'. Change doc string for 'thread apply'. --- gdb/thread.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 112 insertions(+), 20 deletions(-) diff --git a/gdb/thread.c b/gdb/thread.c index f5a29f5cc1..a3776c95b1 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1581,6 +1581,45 @@ tp_array_compar (const thread_info *a, const thread_info *b) return (a->per_inf_num > b->per_inf_num); } +/* Switch to thread THR and executes CMD. + PRINT_WHAT_V verbosity controls the printing of the thread information. + CONT and SILENT control how to handle errors. */ + +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 +1631,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 +1643,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 +1685,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 +1696,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 +1718,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 +1733,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 +1778,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 +2097,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 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\