From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA v2 06/13] Allow C-c to work in backtrace in more cases
Date: Mon, 14 Aug 2017 03:57:00 -0000 [thread overview]
Message-ID: <20170814034030.20863-7-tom@tromey.com> (raw)
In-Reply-To: <20170814034030.20863-1-tom@tromey.com>
PR cli/17716 notes that it is difficult to C-c (or "q" at a pagination
prompt) while backtracing using a frame filter. One reason for this
is that many places in py-framefilter.c use RETURN_MASK_ALL in a
try/catch.
This patch changes these spots to use RETURN_MASK_ERROR instead. This
is safe to do because this entire file is exception safe now.
ChangeLog
2017-08-13 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
RETURN_MASK_ERROR.
---
gdb/ChangeLog | 7 +++++++
gdb/python/py-framefilter.c | 22 +++++++++++-----------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dc4c39f..825c099 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2017-08-13 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
+ RETURN_MASK_ERROR.
+
+2017-08-13 Tom Tromey <tom@tromey.com>
+
* python/py-framefilter.c (enumerate_args): Use
gdb::unique_xmalloc_ptr.
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index 2ae2158..e0a7bd0 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -215,7 +215,7 @@ py_print_type (struct ui_out *out, struct value *val)
type_print (value_type (val), "", &stb, -1);
out->field_stream ("type", stb);
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -255,7 +255,7 @@ py_print_value (struct ui_out *out, struct value *val,
{
type = check_typedef (value_type (val));
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -282,7 +282,7 @@ py_print_value (struct ui_out *out, struct value *val,
common_val_print (val, &stb, indent, opts, language);
out->field_stream ("value", stb);
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -497,7 +497,7 @@ enumerate_args (PyObject *iter,
{
annotate_frame_args ();
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -553,7 +553,7 @@ enumerate_args (PyObject *iter,
{
read_frame_arg (sym, frame, &arg, &entryarg);
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -586,7 +586,7 @@ enumerate_args (PyObject *iter,
out->text (", ");
out->wrap_hint (" ");
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -622,7 +622,7 @@ enumerate_args (PyObject *iter,
{
out->text (", ");
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -636,7 +636,7 @@ enumerate_args (PyObject *iter,
{
annotate_arg_end ();
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -867,7 +867,7 @@ py_print_args (PyObject *filter,
if (! out->is_mi_like_p ())
out->text (" (");
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -884,7 +884,7 @@ py_print_args (PyObject *filter,
if (! out->is_mi_like_p ())
out->text (")");
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
@@ -1336,7 +1336,7 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang,
{
gdbarch = get_frame_arch (frame);
}
- CATCH (except, RETURN_MASK_ALL)
+ CATCH (except, RETURN_MASK_ERROR)
{
/* Let gdb try to print the stack trace. */
return EXT_LANG_BT_NO_FILTERS;
--
2.9.4
next prev parent reply other threads:[~2017-08-14 3:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-14 3:41 [RFA v2 00/13] various frame filter fixes and cleanups Tom Tromey
2017-08-14 3:41 ` [RFA v2 01/13] Rationalize "backtrace" command line parsing Tom Tromey
2017-08-14 15:07 ` Eli Zaretskii
2017-08-14 3:41 ` [RFA v2 07/13] Throw a "quit" on a KeyboardException in py-framefilter.c Tom Tromey
2017-08-14 3:41 ` [RFA v2 11/13] Improve "backtrace" help text Tom Tromey
2017-08-14 13:35 ` Pedro Alves
2017-08-14 14:34 ` Tom Tromey
2017-08-14 14:36 ` Pedro Alves
2017-08-14 14:38 ` Tom Tromey
2017-08-14 3:41 ` [RFA v2 09/13] Return EXT_LANG_BT_ERROR in one more spot in py-framefilter.c Tom Tromey
2017-08-14 3:41 ` [RFA v2 13/13] Remove verbose code from backtrace command Tom Tromey
2017-08-14 13:35 ` Pedro Alves
2017-08-14 3:41 ` [RFA v2 08/13] Move some code later in backtrace_command_1 Tom Tromey
2017-08-14 3:41 ` [RFA v2 02/13] Change backtrace_command_1 calling to use flags Tom Tromey
2017-08-14 3:41 ` [RFA v2 10/13] Call wrap_hint in one more spot in py-framefilter.c Tom Tromey
2017-08-14 3:41 ` [RFA v2 05/13] Avoid manual resource management " Tom Tromey
2017-08-14 3:41 ` [RFA v2 04/13] Remove EXT_LANG_BT_COMPLETED Tom Tromey
2017-08-14 3:41 ` [RFA v2 03/13] Allow elision of some filtered frames Tom Tromey
2017-08-14 15:10 ` Eli Zaretskii
2017-08-14 3:41 ` [RFA v2 12/13] Simplify exception handling in py-framefilter.c Tom Tromey
2017-08-14 13:36 ` Pedro Alves
2017-08-14 3:57 ` Tom Tromey [this message]
2017-08-14 13:20 ` [RFA v2 00/13] various frame filter fixes and cleanups Pedro Alves
2017-08-14 13:57 ` Phil Muldoon
2017-08-14 14:30 ` Pedro Alves
2017-08-14 13:38 ` Pedro Alves
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=20170814034030.20863-7-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