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

Python QUIT processing updates

Browse source 
See the previous patches in this series for the motivation behind
these changes.

This commit contains updates to Python's QUIT handling.  Ideally, we'd
like to throw gdb_exception_forced_quit through the extension
language; I made an attempt to do this for gdb_exception_quit in an
earlier version of this patch, but Pedro pointed out that it is
(almost certainly) not safe to do so.

Still, we definitely don't want to swallow the exception representing
a SIGTERM for GDB, nor do we want to force modules written in the
extension language to have to explicitly handle this case.  Since the
idea is for GDB to cleanup and quit for this exception, we'll simply
call quit_force() just as if the gdb_exception_forced_quit propagation
had managed to make it back to the top level.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=26761
Tested-by: Tom de Vries <tdevries@suse.de>
Approved-By: Pedro Alves <pedro@palves.net>
This commit is contained in:
Kevin Buettner 2023-02-27 16:11:37 -07:00
parent b1ffd1124a
commit b940a061c0
5 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/python/py-finishbreakpoint.c
View file

@ -20,6 +20,7 @@
#include "defs.h"
#include "top.h" /* For quit_force(). */
#include "python-internal.h"
#include "breakpoint.h"
#include "frame.h"
@ -275,6 +276,10 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs)
}
}
}
catch (const gdb_exception_forced_quit &except)
{
quit_force (NULL, 0);
}
catch (const gdb_exception &except)
{
/* Just swallow. Either the return type or the function value

4
gdb/python/py-gdb-readline.c
View file

@ -46,6 +46,10 @@ gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout,
p = command_line_input (buffer, prompt, "python");
}
/* Handle errors by raising Python exceptions. */
catch (const gdb_exception_forced_quit &e)
{
quit_force (NULL, 0);
}
catch (const gdb_exception &except)
{
/* Detect user interrupt (Ctrl-C). */

5
gdb/python/py-symbol.c
View file

@ -18,6 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "top.h" /* For force_quit (). */
#include "block.h"
#include "frame.h"
#include "symtab.h"
@ -517,6 +518,10 @@ gdbpy_lookup_static_symbol (PyObject *self, PyObject *args, PyObject *kw)
= get_selected_frame (_("No frame selected."));
block = get_frame_block (selected_frame, NULL);
}
catch (const gdb_exception_forced_quit &e)
{
quit_force (NULL, 0);
}
catch (const gdb_exception &except)
{
/* Nothing. */

3
gdb/python/py-utils.c
View file

@ -18,6 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "top.h" /* For quit_force (). */
#include "charset.h"
#include "value.h"
#include "python-internal.h"
@ -219,6 +220,8 @@ gdbpy_convert_exception (const struct gdb_exception &exception)
if (exception.reason == RETURN_QUIT)
exc_class = PyExc_KeyboardInterrupt;
else if (exception.reason == RETURN_FORCED_QUIT)
quit_force (NULL, 0);
else if (exception.error == MEMORY_ERROR)
exc_class = gdbpy_gdb_memory_error;
else

5
gdb/python/py-value.c
View file

@ -18,6 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "top.h" /* For quit_force (). */
#include "charset.h"
#include "value.h"
#include "language.h"
@ -371,6 +372,10 @@ valpy_get_address (PyObject *self, void *closure)
res_val = value_addr (val_obj->value);
val_obj->address = value_to_value_object (res_val);
}
catch (const gdb_exception_forced_quit &except)
{
quit_force (NULL, 0);
}
catch (const gdb_exception &except)
{
val_obj->address = Py_None;