From patchwork Thu Aug 6 19:17:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Seitz X-Patchwork-Id: 8069 Received: (qmail 111232 invoked by alias); 6 Aug 2015 22:03:35 -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 111046 invoked by uid 89); 6 Aug 2015 22:03:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=no 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; Thu, 06 Aug 2015 22:03:33 +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 E52C0FC0F7 for ; Thu, 6 Aug 2015 22:03:31 +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 t76JHrjo011649 for ; Thu, 6 Aug 2015 15:17:54 -0400 Subject: [PATCH v3 08/19] Implement completion limiting for signal_completer. From: Keith Seitz To: gdb-patches@sourceware.org Date: Thu, 06 Aug 2015 12:17:53 -0700 Message-ID: <20150806191705.32159.6734.stgit@valrhona.uglyboxes.com> In-Reply-To: <20150806191404.32159.50755.stgit@valrhona.uglyboxes.com> References: <20150806191404.32159.50755.stgit@valrhona.uglyboxes.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes There are no revisions in this version. --- This patch converts signal_completer to use add_completion and adds some tests to cover this new behavior. gdb/ChangeLog * completer.c (signal_completer): Use add_completion. gdb/testsuite/ChangeLog * gdb.base/completion.exp: Add completion limiting tests for "handle signal". --- gdb/completer.c | 6 +++++- gdb/testsuite/gdb.base/completion.exp | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/gdb/completer.c b/gdb/completer.c index 6aa8d35..bf85efe 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -1046,7 +1046,11 @@ signal_completer (struct completer_data *cdata, continue; if (strncasecmp (signame, word, len) == 0) - VEC_safe_push (char_ptr, return_val, xstrdup (signame)); + { + if (add_completion (cdata, &return_val, signame, NULL, NULL) + == ADD_COMPLETION_MAX_REACHED) + break; + } } return return_val; diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index f0b7f2c..884b9f6 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -995,6 +995,33 @@ test_completion_limit "file ./gdb.base/jit-s" \ test_completion_limit "file ./gdb.a" "file \\\./gdb\\\.a(da|rch|sm)" \ $max_completions +# Test completion limiting in signal_completer. +with_test_prefix "signal_completer" { + gdb_test_no_output "set max-completions unlimited" + set num_signals 0 + gdb_test_multiple "complete handle signal SIG10" "" { + "complete handle signal SIG10" { exp_continue } + -re "handle signal SIG10\[0-9\]\r\n" { + incr num_signals + exp_continue + } + -re "$gdb_prompt $" { + pass "count available signals" + } + } + + gdb_test_no_output "set max-completions $max_completions" +} + +if {$num_signals > $max_completions} { + test_completion_limit "handle signal SIG10" \ + "handle signal SIG10\[0-9\]" $max_completions +} else { + set msg "insufficient signals to test completion " + append msg "limiting in signal_handler ($num_signals)" + untested $msg +} + # # Test TUI completions #