From: Sergio Durigan Junior <sergiodj@redhat.com>
To: Gabriel Krisman Bertazi <gabriel@krisman.be>
Cc: gdb-patches@sourceware.org
Subject: Re: [PATCH v2 2/4] Add support to catch groups of syscalls.
Date: Fri, 21 Nov 2014 21:34:00 -0000 [thread overview]
Message-ID: <87fvdcme5r.fsf@redhat.com> (raw)
In-Reply-To: <1416596731-2170-2-git-send-email-gabriel@krisman.be> (Gabriel Krisman Bertazi's message of "Fri, 21 Nov 2014 17:05:29 -0200")
On Friday, November 21 2014, Gabriel Krisman Bertazi wrote:
> This implements the catchpoint side. While parsing 'catch syscall'
> arguments, we verify if the argument is a syscall group and expand it to
> a list of syscalls that are part of that group.
Thanks for the patch. Just a few nits.
> gdb/
>
> * breakpoint.c (catch_syscall_split_args): Verify if argument
> is a syscall group and expand it to a list of syscalls when
> creating catchpoints.
> (catch_syscall_completer): Add word completion for system call
> groups.
> ---
> gdb/breakpoint.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 86 insertions(+), 9 deletions(-)
>
> diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
> index 7b56260..098e28d 100644
> --- a/gdb/breakpoint.c
> +++ b/gdb/breakpoint.c
> @@ -12058,10 +12058,39 @@ catch_syscall_split_args (char *arg)
> cur_name[i] = '\0';
> arg += i;
>
> - /* Check if the user provided a syscall name or a number. */
> + /* Check if the user provided a syscall name, group, or a
> + number. */
> syscall_number = (int) strtol (cur_name, &endptr, 0);
> if (*endptr == '\0')
> - get_syscall_by_number (gdbarch, syscall_number, &s);
> + {
> + get_syscall_by_number (gdbarch, syscall_number, &s);
> + VEC_safe_push (int, result, s.number);
> + }
> + else if (strncmp (cur_name, "g:", 2) == 0
> + || strncmp (cur_name, "group:", 6) == 0)
I'm not a fan of using numbers here. I prefer something like:
if (strncmp (cur_name, "g:", sizeof ("g:") -1) == 0)
which is a dialect used everywhere in GDB.
> + {
> + /* We have a syscall group. Let's expand it into a syscall
> + list before inserting. */
> + struct syscall *syscall_list;
> + const char *group_name;
> +
> + /* Skip over "g:" and "group:" prefix strings. */
> + group_name = strchr (cur_name, ':') + 1;
> +
> + syscall_list = get_syscalls_by_group (gdbarch, group_name);
> +
> + if (syscall_list == NULL)
> + error (_("Unknown syscall group '%s'."), group_name);
> +
> + for (i = 0; syscall_list[i].name != NULL; i++)
> + {
> + /* Insert each syscall that are part of the group. No
> + need to check if it is valid. */
> + VEC_safe_push (int, result, syscall_list[i].number);
> + }
> +
> + xfree (syscall_list);
> + }
> else
> {
> /* We have a name. Let's check if it's valid and convert it
> @@ -12073,10 +12102,10 @@ catch_syscall_split_args (char *arg)
> because GDB cannot do anything useful if there's no
> syscall number to be caught. */
> error (_("Unknown syscall name '%s'."), cur_name);
> - }
>
> - /* Ok, it's valid. */
> - VEC_safe_push (int, result, s.number);
> + /* Ok, it's valid. */
> + VEC_safe_push (int, result, s.number);
> + }
> }
>
> discard_cleanups (cleanup);
> @@ -15350,11 +15379,59 @@ static VEC (char_ptr) *
> catch_syscall_completer (struct cmd_list_element *cmd,
> const char *text, const char *word)
> {
> - const char **list = get_syscall_names (get_current_arch ());
> - VEC (char_ptr) *retlist
> - = (list == NULL) ? NULL : complete_on_enum (list, word, word);
> + struct gdbarch *gdbarch = get_current_arch ();
> + struct cleanup *cleanups;
I know you're initializing the "cleanups" both on "if" and on "else",
but I'd prefer if you did:
struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
This way, if someone touches the code and removes the initialization
from some the if/else parts, the code would still DTRT.
> + VEC (char_ptr) *group_retlist = NULL;
> + VEC (char_ptr) *syscall_retlist = NULL;
> + VEC (char_ptr) *retlist = NULL;
> + const char **group_list = NULL;
> + const char **syscall_list = NULL;
> + const char *prefix;
> + int i;
> +
> + /* Completion considers ':' to be a word separator, so we use this to
> + verify whether the previous word was a group prefix. If so, we
> + build the completion list using group names only. */
> + for (prefix = word; prefix != text && prefix[-1] != ' '; prefix--)
> + ;
> +
> + if (strncmp (prefix, "g:", 2) == 0 || strncmp (prefix, "group:", 6) == 0)
Same comment about using 'sizeof ("str") - 1' applies here.
> + {
> + /* Perform completion inside 'group:' namespace only. */
> + group_list = get_syscall_group_names (gdbarch);
> + cleanups = make_cleanup (xfree, group_list);
If you follow my advice above, there's no need to do this assignment;
just call make_cleanup.
> + retlist = (group_list == NULL) ?
> + NULL : complete_on_enum (group_list, word, word);
> + }
> + else
> + {
> + /* Complete with both, syscall names and groups. */
> + syscall_list = get_syscall_names (gdbarch);
> + group_list = get_syscall_group_names (gdbarch);
> + cleanups = make_cleanup (xfree, group_list);
> +
> + /* Append "group:" prefix to syscall groups. */
> + for (i = 0; group_list[i] != NULL; i++)
> + {
> + char *prefixed_group = xstrprintf ("group:%s", group_list[i]);
> +
> + group_list[i] = prefixed_group;
> + make_cleanup (xfree, prefixed_group);
> + }
> +
> + syscall_retlist = (syscall_list == NULL) ?
> + NULL : complete_on_enum (syscall_list, word, word);
> + group_retlist = (group_list == NULL) ?
> + NULL : complete_on_enum (group_list, word, word);
> +
> + retlist = VEC_merge (char_ptr, syscall_retlist, group_retlist);
> + }
> +
> + VEC_free (char_ptr, syscall_retlist);
> + VEC_free (char_ptr, group_retlist);
> + xfree (syscall_list);
> + do_cleanups (cleanups);
>
> - xfree (list);
> return retlist;
> }
>
> --
> 1.9.3
Other than that, the patch looks good to me now. I'd say there's no
need to send a v3 just because of those changes; just wait for some
global maintainer to approve it for you now :-).
Thanks for doing this.
--
Sergio
GPG key ID: 0x65FC5E36
Please send encrypted e-mail if possible
http://sergiodj.net/
next prev parent reply other threads:[~2014-11-21 21:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 19:05 [PATCH v2 1/4] Implemement support for groups of syscalls in the xml-syscall interface Gabriel Krisman Bertazi
2014-11-02 19:36 ` [PATCH 0/4] Catch syscall groups Gabriel Krisman Bertazi
2014-11-02 19:36 ` [PATCH 1/4] Implemement support for groups of syscalls in the xml-syscall interface Gabriel Krisman Bertazi
2014-11-14 22:42 ` Sergio Durigan Junior
2014-11-02 19:36 ` [PATCH 2/4] Add support to catch groups of syscalls Gabriel Krisman Bertazi
2014-11-14 22:55 ` Sergio Durigan Junior
2014-11-02 19:37 ` [PATCH 4/4] Update documentation on catching a group of related syscalls Gabriel Krisman Bertazi
2014-11-02 19:45 ` Eli Zaretskii
2014-11-12 2:04 ` Gabriel Krisman Bertazi
2014-11-12 3:48 ` Eli Zaretskii
2014-11-14 18:52 ` Gabriel Krisman Bertazi
2014-11-14 20:38 ` Eli Zaretskii
2014-11-03 18:38 ` Sergio Durigan Junior
2014-11-02 19:37 ` [PATCH 3/4] Create syscall groups for x86_64 Gabriel Krisman Bertazi
2014-11-14 23:00 ` Sergio Durigan Junior
2014-11-20 2:11 ` Gabriel Krisman Bertazi
2014-11-20 3:08 ` Sergio Durigan Junior
2014-11-21 19:05 ` [PATCH v2 2/4] Add support to catch groups of syscalls Gabriel Krisman Bertazi
2014-11-21 21:34 ` Sergio Durigan Junior [this message]
2015-01-15 8:12 ` Doug Evans
2014-11-21 19:06 ` [PATCH v2 4/4] Update documentation on catching a group of related syscalls Gabriel Krisman Bertazi
2014-11-21 19:48 ` Eli Zaretskii
2014-11-26 3:58 ` Gabriel Krisman Bertazi
2014-11-21 19:06 ` [PATCH v2 3/4] Create syscall groups for x86_64 Gabriel Krisman Bertazi
2015-01-15 8:28 ` Doug Evans
2014-11-29 0:19 ` [ping PATCH v2 1/4] Implemement support for groups of syscalls in the xml-syscall interface Gabriel Krisman Bertazi
2014-12-08 0:09 ` [ping^2 " Gabriel Krisman Bertazi
2014-12-21 15:59 ` [ping^3 " Gabriel Krisman Bertazi
2015-01-12 20:47 ` Doug Evans
2015-01-15 8:03 ` [PATCH " Doug Evans
2015-01-29 4:43 ` Gabriel Krisman Bertazi
2015-01-29 7:42 ` Doug Evans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fvdcme5r.fsf@redhat.com \
--to=sergiodj@redhat.com \
--cc=gabriel@krisman.be \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).