This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH 08/18] Implement completion limiting for signal_completer.


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
+}


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]