From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1035 invoked by alias); 15 Jan 2015 08:12:23 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 1020 invoked by uid 89); 15 Jan 2015 08:12:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f46.google.com Received: from mail-pa0-f46.google.com (HELO mail-pa0-f46.google.com) (209.85.220.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 15 Jan 2015 08:12:18 +0000 Received: by mail-pa0-f46.google.com with SMTP id lf10so16050206pab.5 for ; Thu, 15 Jan 2015 00:12:16 -0800 (PST) X-Received: by 10.68.135.168 with SMTP id pt8mr12380208pbb.150.1421309536543; Thu, 15 Jan 2015 00:12:16 -0800 (PST) Received: from seba.sebabeach.org.gmail.com (173-13-178-53-sfba.hfc.comcastbusiness.net. [173.13.178.53]) by mx.google.com with ESMTPSA id y3sm811529pbt.44.2015.01.15.00.12.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2015 00:12:15 -0800 (PST) From: Doug Evans To: Gabriel Krisman Bertazi Cc: gdb-patches@sourceware.org Subject: Re: [PATCH v2 2/4] Add support to catch groups of syscalls. References: <1416596731-2170-1-git-send-email-gabriel@krisman.be> <1414956944-8856-1-git-send-email-gabriel@krisman.be> <1416596731-2170-2-git-send-email-gabriel@krisman.be> Date: Thu, 15 Jan 2015 08:12:00 -0000 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") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00408.txt.bz2 Gabriel Krisman Bertazi writes: > 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. > > 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. Hi. A few nits inline. Ok with those changes, and things mentioned in other reviews. > --- > 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. */ Put number on previous line. > 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) > + { > + /* 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; > + 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) > + { > + /* Perform completion inside 'group:' namespace only. */ > + group_list = get_syscall_group_names (gdbarch); > + cleanups = make_cleanup (xfree, group_list); > + retlist = (group_list == NULL) ? > + NULL : complete_on_enum (group_list, word, word); The indentation is wrong here. Here's one correct way. retlist = (group_list == NULL ? NULL : complete_on_enum (group_list, word, word)); or 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); Similarly, indentation is wrong. See above. > + > + 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; > }