From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 121381 invoked by alias); 13 Apr 2015 19:23:31 -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 121359 invoked by uid 89); 13 Apr 2015 19:23:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 13 Apr 2015 19:23:30 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 1B9FEA10C0 for ; Mon, 13 Apr 2015 19:23:29 +0000 (UTC) Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3DJNSx4030987 for ; Mon, 13 Apr 2015 15:23:28 -0400 Subject: [PATCH 11/18] Implement completion limiting for reg_or_group_completer. From: Keith Seitz To: gdb-patches@sourceware.org Date: Mon, 13 Apr 2015 19:23:00 -0000 Message-ID: <20150413192328.29172.31280.stgit@valrhona.uglyboxes.com> In-Reply-To: <20150413192235.29172.13097.stgit@valrhona.uglyboxes.com> References: <20150413192235.29172.13097.stgit@valrhona.uglyboxes.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-04/txt/msg00493.txt.bz2 This patch converts reg_or_group_completer to use maybe_add_completion and adds tests for this new behavior. gdb/ChangeLog * completer.c (reg_or_group_completer): Use maybe_add_completion. gdb/testsuite/ChangeLog * gdb.base/completion.exp: Add tests for limit completing "info reigsters". --- gdb/completer.c | 46 ++++++++++++++++++++++++++++++--- gdb/testsuite/gdb.base/completion.exp | 4 +++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/gdb/completer.c b/gdb/completer.c index 3022d7e..b112c2c 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -1048,6 +1048,7 @@ reg_or_group_completer (struct completer_data *cdata, struct reggroup *group; const char *name; int i; + enum maybe_add_completion_enum add_status; if (!target_has_registers) return result; @@ -1059,16 +1060,53 @@ reg_or_group_completer (struct completer_data *cdata, i++) { if (*name != '\0' && strncmp (word, name, len) == 0) - VEC_safe_push (char_ptr, result, xstrdup (name)); + { + char *match = xstrdup (name); + + add_status = maybe_add_completion (cdata, match); + switch (add_status) + { + case MAYBE_ADD_COMPLETION_OK: + VEC_safe_push (char_ptr, result, match); + break; + case MAYBE_ADD_COMPLETION_OK_MAX_REACHED: + VEC_safe_push (char_ptr, result, match); + return result; + case MAYBE_ADD_COMPLETION_MAX_REACHED: + xfree (match); + return result; + case MAYBE_ADD_COMPLETION_DUPLICATE: + xfree (match); + break; + } + } } for (group = reggroup_next (gdbarch, NULL); group != NULL; group = reggroup_next (gdbarch, group)) { - name = reggroup_name (group); - if (strncmp (word, name, len) == 0) - VEC_safe_push (char_ptr, result, xstrdup (name)); + char *match = xstrdup (reggroup_name (group)); + + if (strncmp (word, match, len) == 0) + { + add_status = maybe_add_completion (cdata, match); + switch (add_status) + { + case MAYBE_ADD_COMPLETION_OK: + VEC_safe_push (char_ptr, result, match); + break; + case MAYBE_ADD_COMPLETION_OK_MAX_REACHED: + VEC_safe_push (char_ptr, result, match); + return result; + case MAYBE_ADD_COMPLETION_MAX_REACHED: + xfree (match); + return result; + case MAYBE_ADD_COMPLETION_DUPLICATE: + xfree (match); + break; + } + } } return result; diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index d07ca86..4a35cd1 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -1037,3 +1037,7 @@ with_test_prefix "interpreter_completer reset" { set max_completions $old_max gdb_test_no_output "set max-completions $max_completions" } + +# Test reg_or_group_completer. +test_completion_limit "info registers " \ + "info registers \[a-zA-Z0-9\]+" $max_completions