FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Throw a "quit" on a KeyboardException in py-framefilter.c

Browse source 
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.

gdb/ChangeLog
2018-03-26  Tom Tromey  <tom@tromey.com>

	* python/py-framefilter.c (throw_quit_or_print_exception): New
	function.
	(gdbpy_apply_frame_filter): Use it.

gdb/testsuite/ChangeLog
2018-03-26  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.
This commit is contained in:
Tom Tromey 2017-04-24 21:47:59 -06:00
parent 92256134f3
commit 4ca59a9f36
5 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gdb/python/py-framefilter.c
View file

@ -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
@ -1375,7 +1390,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;
}
@ -1398,7 +1413,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;
@ -1423,7 +1438,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;