public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom Tromey <tromey@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Use gdbpy_enter in py-breakpoint.c Date: Wed, 11 Jan 2017 05:22:00 -0000 [thread overview] Message-ID: <20170111052027.66674.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=de2dc875c2ddb731741f3c326545ff91fd587dd5 commit de2dc875c2ddb731741f3c326545ff91fd587dd5 Author: Tom Tromey <tom@tromey.com> Date: Mon Nov 7 15:59:41 2016 -0700 Use gdbpy_enter in py-breakpoint.c Change py-breakpoint.c to use gdbpy_enter. 2017-01-10 Tom Tromey <tom@tromey.com> * python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Use gdbpy_enter. (gdbpy_breakpoint_has_cond): Likewise. Diff: --- gdb/ChangeLog | 6 ++++++ gdb/python/py-breakpoint.c | 14 ++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b64e9e9..fb156a9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2017-01-10 Tom Tromey <tom@tromey.com> + * python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Use + gdbpy_enter. + (gdbpy_breakpoint_has_cond): Likewise. + +2017-01-10 Tom Tromey <tom@tromey.com> + * python/python.c (gdbpy_enter): New constructor. (~gdbpy_enter): New destructor. (restore_python_env, ensure_python_env): Rewrite. diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index eedb697..f3520cc 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -791,14 +791,14 @@ gdbpy_breakpoint_cond_says_stop (const struct extension_language_defn *extlang, struct gdbpy_breakpoint_object *bp_obj = b->py_bp_object; PyObject *py_bp = (PyObject *) bp_obj; struct gdbarch *garch; - struct cleanup *cleanup; if (bp_obj == NULL) return EXT_LANG_BP_STOP_UNSET; stop = -1; garch = b->gdbarch ? b->gdbarch : get_current_arch (); - cleanup = ensure_python_env (garch, current_language); + + gdbpy_enter enter_py (garch, current_language); if (bp_obj->is_finish_bp) bpfinishpy_pre_stop_hook (bp_obj); @@ -829,8 +829,6 @@ gdbpy_breakpoint_cond_says_stop (const struct extension_language_defn *extlang, if (bp_obj->is_finish_bp) bpfinishpy_post_stop_hook (bp_obj); - do_cleanups (cleanup); - if (stop < 0) return EXT_LANG_BP_STOP_UNSET; return stop ? EXT_LANG_BP_STOP_YES : EXT_LANG_BP_STOP_NO; @@ -844,21 +842,17 @@ int gdbpy_breakpoint_has_cond (const struct extension_language_defn *extlang, struct breakpoint *b) { - int has_func; PyObject *py_bp; struct gdbarch *garch; - struct cleanup *cleanup; if (b->py_bp_object == NULL) return 0; py_bp = (PyObject *) b->py_bp_object; garch = b->gdbarch ? b->gdbarch : get_current_arch (); - cleanup = ensure_python_env (garch, current_language); - has_func = PyObject_HasAttrString (py_bp, stop_func); - do_cleanups (cleanup); - return has_func; + gdbpy_enter enter_py (garch, current_language); + return PyObject_HasAttrString (py_bp, stop_func); }
next reply other threads:[~2017-01-11 5:20 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-11 5:22 Tom Tromey [this message] 2019-06-10 13:28 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=20170111052027.66674.qmail@sourceware.org \ --to=tromey@sourceware.org \ --cc=gdb-cvs@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: linkBe 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).