From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 07/10] Throw a "quit" on a KeyboardException in py-framefilter.c
Date: Tue, 25 Apr 2017 19:42:00 -0000 [thread overview]
Message-ID: <20170425194113.17862-8-tom@tromey.com> (raw)
In-Reply-To: <20170425194113.17862-1-tom@tromey.com>
If a C-c comes while the Python code for a frame filter is running, it
will be turned into a Python KeyboardException. It seems good for
this to be treated like a GDB quit, so this patch changes
py-framefilter.c to notice this situation and call throw_quit in this
case.
ChangeLog
2017-04-25 Tom Tromey <tom@tromey.com>
* python/py-framefilter.c (throw_quit_or_print_exception): New
function.
(gdbpy_apply_frame_filter): Use it.
testsuite/ChangeLog
2017-04-25 Tom Tromey <tom@tromey.com>
* gdb.python/py-framefilter.exp: Add test for KeyboardInterrupt.
* gdb.python/py-framefilter.py (name_error): New global.
(ErrorInName.function): Use name_error.
---
gdb/ChangeLog | 6 ++++++
gdb/python/py-framefilter.c | 21 ++++++++++++++++++---
gdb/testsuite/ChangeLog | 6 ++++++
gdb/testsuite/gdb.python/py-framefilter.exp | 10 ++++++++++
gdb/testsuite/gdb.python/py-framefilter.py | 6 +++++-
5 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d0e0be4..0bf5386 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2017-04-25 Tom Tromey <tom@tromey.com>
+ * python/py-framefilter.c (throw_quit_or_print_exception): New
+ function.
+ (gdbpy_apply_frame_filter): Use it.
+
+2017-04-25 Tom Tromey <tom@tromey.com>
+
PR cli/17716:
* python/py-framefilter.c (py_print_type, py_print_value)
(enumerate_args, py_print_args, gdbpy_apply_frame_filter): Use
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index e0a7bd0..76e637c 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -1305,6 +1305,21 @@ bootstrap_python_frame_filters (struct frame_info *frame,
return iterable.release ();
}
+/* A helper function that will either print an exception or, if it is
+ a KeyboardException, throw a quit. This can only be called when
+ the Python exception is set. */
+
+static void
+throw_quit_or_print_exception ()
+{
+ if (PyErr_ExceptionMatches (PyExc_KeyboardInterrupt))
+ {
+ PyErr_Clear ();
+ throw_quit ("Quit");
+ }
+ gdbpy_print_stack ();
+}
+
/* This is the only publicly exported function in this file. FRAME
is the source frame to start frame-filter invocation. FLAGS is an
integer holding the flags for printing. The following elements of
@@ -1363,7 +1378,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
initialization error. This return code will trigger a
default backtrace. */
- gdbpy_print_stack ();
+ throw_quit_or_print_exception ();
return EXT_LANG_BT_NO_FILTERS;
}
@@ -1386,7 +1401,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
{
if (PyErr_Occurred ())
{
- gdbpy_print_stack ();
+ throw_quit_or_print_exception ();
return EXT_LANG_BT_ERROR;
}
break;
@@ -1398,7 +1413,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
/* Do not exit on error printing a single frame. Print the
error and continue with other frames. */
if (success == EXT_LANG_BT_ERROR)
- gdbpy_print_stack ();
+ throw_quit_or_print_exception ();
}
return success;
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f9f48c5..6f6bbce 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2017-04-25 Tom Tromey <tom@tromey.com>
+ * gdb.python/py-framefilter.exp: Add test for KeyboardInterrupt.
+ * gdb.python/py-framefilter.py (name_error): New global.
+ (ErrorInName.function): Use name_error.
+
+2017-04-25 Tom Tromey <tom@tromey.com>
+
PR backtrace/15582:
* gdb.python/py-framefilter.exp: Add "bt elide" test.
diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp
index 80aa495..1a0572d 100644
--- a/gdb/testsuite/gdb.python/py-framefilter.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter.exp
@@ -213,6 +213,16 @@ gdb_test_multiple "bt 1" $test {
}
}
+# Now verify that we can see a quit.
+gdb_test_no_output "python name_error = KeyboardInterrupt" \
+ "Change ErrorFilter to throw KeyboardInterrupt"
+set test "bt 1 with KeyboardInterrupt"
+gdb_test_multiple "bt 1" $test {
+ -re "Quit" {
+ pass $test
+ }
+}
+
# Test with no debuginfo
# We cannot use prepare_for_testing as we have to set the safe-patch
diff --git a/gdb/testsuite/gdb.python/py-framefilter.py b/gdb/testsuite/gdb.python/py-framefilter.py
index edd0e00..b579ec3 100644
--- a/gdb/testsuite/gdb.python/py-framefilter.py
+++ b/gdb/testsuite/gdb.python/py-framefilter.py
@@ -134,13 +134,17 @@ class FrameElider ():
def filter (self, frame_iter):
return ElidingIterator (frame_iter)
+# This is here so the test can change the kind of error that is
+# thrown.
+name_error = RuntimeError
+
# A simple decorator that gives an error when computing the function.
class ErrorInName(FrameDecorator):
def __init__(self, frame):
FrameDecorator.__init__(self, frame)
def function(self):
- raise RuntimeError('whoops')
+ raise name_error('whoops')
# A filter that supplies buggy frames. Disabled by default.
class ErrorFilter():
--
2.9.3
next prev parent reply other threads:[~2017-04-25 19:41 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 19:41 [RFA 00/10] various frame filter fixes and cleanups Tom Tromey
2017-04-25 19:41 ` [RFA 04/10] Remove EXT_LANG_BT_COMPLETED Tom Tromey
2017-04-28 14:52 ` Phil Muldoon
2017-06-27 16:40 ` Pedro Alves
2017-04-25 19:41 ` [RFA 06/10] Allow C-c to work in backtrace in more cases Tom Tromey
2017-04-28 14:55 ` Phil Muldoon
2017-06-27 16:46 ` Pedro Alves
2017-04-25 19:41 ` [RFA 01/10] Rationalize "backtrace" command line parsing Tom Tromey
2017-04-26 10:33 ` Eli Zaretskii
2017-06-27 16:25 ` Pedro Alves
2017-07-09 22:34 ` Tom Tromey
2017-07-10 16:48 ` Eli Zaretskii
2017-07-14 12:08 ` Pedro Alves
2017-04-25 19:42 ` [RFA 05/10] Avoid manual resource management in py-framefilter.c Tom Tromey
2017-04-28 14:53 ` Phil Muldoon
2017-06-27 16:43 ` Pedro Alves
2017-04-25 19:42 ` Tom Tromey [this message]
2017-04-28 15:06 ` [RFA 07/10] Throw a "quit" on a KeyboardException " Phil Muldoon
2017-06-27 16:59 ` Pedro Alves
2017-04-25 19:42 ` [RFA 09/10] Return EXT_LANG_BT_ERROR in one more spot " Tom Tromey
2017-04-28 15:08 ` Phil Muldoon
2017-06-27 17:31 ` Pedro Alves
2017-06-27 19:08 ` Pedro Alves
2017-04-25 19:42 ` [RFA 10/10] Call wrap_hint " Tom Tromey
2017-04-28 15:09 ` Phil Muldoon
2017-06-27 17:35 ` Pedro Alves
2017-04-25 19:42 ` [RFA 03/10] Allow elision of some filtered frames Tom Tromey
2017-04-26 10:35 ` Eli Zaretskii
2017-04-28 14:50 ` Phil Muldoon
2017-06-27 16:40 ` Pedro Alves
2017-06-27 20:01 ` Tom Tromey
2017-04-25 19:43 ` [RFA 08/10] Move some code later in backtrace_command_1 Tom Tromey
2017-04-28 15:08 ` Phil Muldoon
2017-06-27 17:18 ` Pedro Alves
2017-04-25 19:43 ` [RFA 02/10] Change backtrace_command_1 calling to use flags Tom Tromey
2017-04-28 14:40 ` Phil Muldoon
2017-06-27 16:29 ` Pedro Alves
2017-07-09 22:22 ` Tom Tromey
2017-07-14 12:02 ` Pedro Alves
2017-07-14 19:16 ` Tom Tromey
2017-04-27 8:58 ` [RFA 00/10] various frame filter fixes and cleanups Phil Muldoon
2017-05-29 17:21 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170425194113.17862-8-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).