From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 120514 invoked by alias); 13 Apr 2015 19:23:24 -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 120481 invoked by uid 89); 13 Apr 2015 19:23:23 -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:22 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3DJNLLc003162 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 13 Apr 2015 15:23:21 -0400 Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3DJNLM7017521 for ; Mon, 13 Apr 2015 15:23:21 -0400 Subject: [PATCH 08/18] Implement completion limiting for signal_completer. From: Keith Seitz To: gdb-patches@sourceware.org Date: Mon, 13 Apr 2015 19:23:00 -0000 Message-ID: <20150413192321.29172.22932.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/msg00496.txt.bz2 This patch converts signal_completer to use maybe_add_completion and adds some tests to cover this new behavior. gdb/ChangeLog * completer.c (signal_completer): Use maybe_add_completion. gdb/testsuite/ChangeLog * gdb.base/completion.exp: Add completion limiting tests for "handle signal". --- gdb/completer.c | 22 +++++++++++++++++++++- gdb/testsuite/gdb.base/completion.exp | 27 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/gdb/completer.c b/gdb/completer.c index 291ba73..3022d7e 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -1009,7 +1009,27 @@ signal_completer (struct completer_data *cdata, continue; if (strncasecmp (signame, word, len) == 0) - VEC_safe_push (char_ptr, return_val, xstrdup (signame)); + { + char *completion = xstrdup (signame); + enum maybe_add_completion_enum add_status; + + add_status = maybe_add_completion (cdata, completion); + switch (add_status) + { + case MAYBE_ADD_COMPLETION_OK: + VEC_safe_push (char_ptr, return_val, completion); + break; + case MAYBE_ADD_COMPLETION_OK_MAX_REACHED: + VEC_safe_push (char_ptr, return_val, completion); + return return_val; + case MAYBE_ADD_COMPLETION_MAX_REACHED: + xfree (completion); + return return_val; + case MAYBE_ADD_COMPLETION_DUPLICATE: + xfree (completion); + break; + } + } } return return_val; diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index 78ba216..90cdb36 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -994,3 +994,30 @@ test_completion_limit "file ./gdb.base/jit-s" \ # same as above but completing on directory names. 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 +}