Use gdbpy_enter in py-breakpoint.c
Commit Message
A few spots in py-breakpoint.c acquire the GIL manually. However,
because these spots generate events, and because events are expected
to be arbitrary gdb-flavored Python code, it's important to use
gdbpy_enter instead, in order to ensure that the other gdb-related
Python globals are set correctly.
This patch makes this change. Tested on x86-64 Fedora 29.
gdb/ChangeLog
2019-06-07 Tom Tromey <tom@tromey.com>
* python/py-breakpoint.c (gdbpy_breakpoint_created)
(gdbpy_breakpoint_deleted, gdbpy_breakpoint_modified): Use
gdbpy_enter.
---
gdb/ChangeLog | 6 ++++++
gdb/python/py-breakpoint.c | 18 ++++++++----------
2 files changed, 14 insertions(+), 10 deletions(-)
Comments
On Fri, 7 Jun 2019 16:10:26 -0600
Tom Tromey <tom@tromey.com> wrote:
> A few spots in py-breakpoint.c acquire the GIL manually. However,
> because these spots generate events, and because events are expected
> to be arbitrary gdb-flavored Python code, it's important to use
> gdbpy_enter instead, in order to ensure that the other gdb-related
> Python globals are set correctly.
>
> This patch makes this change. Tested on x86-64 Fedora 29.
>
> gdb/ChangeLog
> 2019-06-07 Tom Tromey <tom@tromey.com>
>
> * python/py-breakpoint.c (gdbpy_breakpoint_created)
> (gdbpy_breakpoint_deleted, gdbpy_breakpoint_modified): Use
> gdbpy_enter.
LGTM.
Kevin
@@ -1003,7 +1003,6 @@ static void
gdbpy_breakpoint_created (struct breakpoint *bp)
{
gdbpy_breakpoint_object *newbp;
- PyGILState_STATE state;
if (!user_breakpoint_p (bp) && bppy_pending_object == NULL)
return;
@@ -1015,7 +1014,8 @@ gdbpy_breakpoint_created (struct breakpoint *bp)
&& bp->type != bp_access_watchpoint)
return;
- state = PyGILState_Ensure ();
+ struct gdbarch *garch = bp->gdbarch ? bp->gdbarch : get_current_arch ();
+ gdbpy_enter enter_py (garch, current_language);
if (bppy_pending_object)
{
@@ -1046,8 +1046,6 @@ gdbpy_breakpoint_created (struct breakpoint *bp)
gdb_py_events.breakpoint_created) < 0)
gdbpy_print_stack ();
}
-
- PyGILState_Release (state);
}
/* Callback that is used when a breakpoint is deleted. This will
@@ -1056,13 +1054,14 @@ static void
gdbpy_breakpoint_deleted (struct breakpoint *b)
{
int num = b->number;
- PyGILState_STATE state;
struct breakpoint *bp = NULL;
- state = PyGILState_Ensure ();
bp = get_breakpoint (num);
if (bp)
{
+ struct gdbarch *garch = bp->gdbarch ? bp->gdbarch : get_current_arch ();
+ gdbpy_enter enter_py (garch, current_language);
+
gdbpy_ref<gdbpy_breakpoint_object> bp_obj (bp->py_bp_object);
if (bp_obj != NULL)
{
@@ -1077,7 +1076,6 @@ gdbpy_breakpoint_deleted (struct breakpoint *b)
--bppy_live;
}
}
- PyGILState_Release (state);
}
/* Callback that is used when a breakpoint is modified. */
@@ -1086,13 +1084,14 @@ static void
gdbpy_breakpoint_modified (struct breakpoint *b)
{
int num = b->number;
- PyGILState_STATE state;
struct breakpoint *bp = NULL;
- state = PyGILState_Ensure ();
bp = get_breakpoint (num);
if (bp)
{
+ struct gdbarch *garch = bp->gdbarch ? bp->gdbarch : get_current_arch ();
+ gdbpy_enter enter_py (garch, current_language);
+
PyObject *bp_obj = (PyObject *) bp->py_bp_object;
if (bp_obj)
{
@@ -1104,7 +1103,6 @@ gdbpy_breakpoint_modified (struct breakpoint *b)
}
}
}
- PyGILState_Release (state);
}