From patchwork Tue Apr 25 19:41:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 20149 Received: (qmail 25568 invoked by alias); 25 Apr 2017 19:42:14 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 25394 invoked by uid 89); 25 Apr 2017 19:42:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gproxy8.mail.unifiedlayer.com Received: from gproxy8-pub.mail.unifiedlayer.com (HELO gproxy8.mail.unifiedlayer.com) (67.222.33.93) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Apr 2017 19:42:10 +0000 Received: from cmgw3 (unknown [10.0.90.84]) by gproxy8.mail.unifiedlayer.com (Postfix) with ESMTP id A97BE1AB579 for ; Tue, 25 Apr 2017 13:41:32 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id CjhV1v00t2f2jeq01jhYpK; Tue, 25 Apr 2017 13:41:32 -0600 X-Authority-Analysis: v=2.2 cv=VKStp5HX c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=AzvcPWV-tVgA:10 a=zstS-IiYAAAA:8 a=0FD05c-RAAAA:8 a=20KFwNOVAAAA:8 a=C2Sbv50cXBAS1bQvlGQA:9 a=4G6NA9xxw8l3yy4pmD5M:22 a=l1rpMCqCXRGZwUSuRcM3:22 Received: from 75-166-63-71.hlrn.qwest.net ([75.166.63.71]:40598 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1d36L3-0000OG-Ds; Tue, 25 Apr 2017 13:41:29 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 03/10] Allow elision of some filtered frames Date: Tue, 25 Apr 2017 13:41:06 -0600 Message-Id: <20170425194113.17862-4-tom@tromey.com> In-Reply-To: <20170425194113.17862-1-tom@tromey.com> References: <20170425194113.17862-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1d36L3-0000OG-Ds X-Source-Sender: 75-166-63-71.hlrn.qwest.net (bapiya.Home) [75.166.63.71]:40598 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== When a frame filter elides some frames, they are still printed by "bt", indented a few spaces. PR backtrace/15582 notes that it would be nice for users if elided frames could simply be dropped. This patch adds this capability. ChangeLog 2017-04-25 Tom Tromey PR backtrace/15582: * stack.c (backtrace_command): Parse "elide" argument. * python/py-framefilter.c (py_print_frame): Handle PRINT_ELIDE. * extension.h (enum frame_filter_flags) : New constant. doc/ChangeLog 2017-04-25 Tom Tromey PR backtrace/15582: * gdb.texinfo (Backtrace): Mention "elide" argument. testsuite/ChangeLog 2017-04-25 Tom Tromey PR backtrace/15582: * gdb.python/py-framefilter.exp: Add "bt elide" test. --- gdb/ChangeLog | 8 +++++ gdb/doc/ChangeLog | 5 +++ gdb/doc/gdb.texinfo | 6 ++++ gdb/extension.h | 3 ++ gdb/python/py-framefilter.c | 50 ++++++++++++++--------------- gdb/stack.c | 2 ++ gdb/testsuite/ChangeLog | 5 +++ gdb/testsuite/gdb.python/py-framefilter.exp | 3 ++ 8 files changed, 57 insertions(+), 25 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ab9b432..f68e32c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2017-04-25 Tom Tromey + PR backtrace/15582: + * stack.c (backtrace_command): Parse "elide" argument. + * python/py-framefilter.c (py_print_frame): Handle PRINT_ELIDE. + * extension.h (enum frame_filter_flags) : New + constant. + +2017-04-25 Tom Tromey + * stack.c (backtrace_command_1): Remove "show_locals" parameter, add "flags". (backtrace_command): Remove "fulltrace", add "flags". diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index cf2226c..1cdc809 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,5 +1,10 @@ 2017-04-25 Tom Tromey + PR backtrace/15582: + * gdb.texinfo (Backtrace): Mention "elide" argument. + +2017-04-25 Tom Tromey + * gdb.texinfo (Backtrace): Describe options individually. 2017-04-21 Simon Marchi diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index a9f12fd..c30b7b5 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -7225,6 +7225,12 @@ Filter API}, for more information. Additionally use @ref{disable frame-filter all} to turn off all frame filters. This is only relevant when @value{GDBN} has been configured with @code{Python} support. + +@item backtrace elide +A Python frame filter might decide to ``elide'' some frames. Normally +such elided frames are still printed, but they are indented relative +to the filtered frames that cause them to be elided. The @code{elide} +option causes elided frames to not be printed at all. @end table @kindex where diff --git a/gdb/extension.h b/gdb/extension.h index 2c79411..7c35502 100644 --- a/gdb/extension.h +++ b/gdb/extension.h @@ -100,6 +100,9 @@ enum frame_filter_flags /* Set this flag if frame locals are to be printed. */ PRINT_LOCALS = 8, + + /* Set this flag if elided frames should not be printed. */ + PRINT_ELIDE = 32, }; /* A choice of the different frame argument printing strategies that diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 75b055c..f0474a9 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -1238,37 +1238,37 @@ py_print_frame (PyObject *filter, int flags, return EXT_LANG_BT_ERROR; } - { - /* Finally recursively print elided frames, if any. */ - gdbpy_ref<> elided (get_py_iter_from_func (filter, "elided")); - if (elided == NULL) - return EXT_LANG_BT_ERROR; + if ((flags & PRINT_ELIDE) == 0) + { + /* Finally recursively print elided frames, if any. */ + gdbpy_ref<> elided (get_py_iter_from_func (filter, "elided")); + if (elided == NULL) + return EXT_LANG_BT_ERROR; - if (elided != Py_None) - { - PyObject *item; + if (elided != Py_None) + { + PyObject *item; - ui_out_emit_list inner_list_emiter (out, "children"); + ui_out_emit_list inner_list_emiter (out, "children"); - if (! out->is_mi_like_p ()) - indent++; + if (! out->is_mi_like_p ()) + indent++; - while ((item = PyIter_Next (elided.get ()))) - { - gdbpy_ref<> item_ref (item); + while ((item = PyIter_Next (elided.get ()))) + { + gdbpy_ref<> item_ref (item); - enum ext_lang_bt_status success = py_print_frame (item, flags, - args_type, out, - indent, - levels_printed); + enum ext_lang_bt_status success + = py_print_frame (item, flags, args_type, out, indent, + levels_printed); - if (success == EXT_LANG_BT_ERROR) - return EXT_LANG_BT_ERROR; - } - if (item == NULL && PyErr_Occurred ()) - return EXT_LANG_BT_ERROR; - } - } + if (success == EXT_LANG_BT_ERROR) + return EXT_LANG_BT_ERROR; + } + if (item == NULL && PyErr_Occurred ()) + return EXT_LANG_BT_ERROR; + } + } return EXT_LANG_BT_COMPLETED; } diff --git a/gdb/stack.c b/gdb/stack.c index b320c93..77e8c9b 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1890,6 +1890,8 @@ backtrace_command (char *arg, int from_tty) filters = false; else if (subset_compare (this_arg, "full")) flags |= PRINT_LOCALS; + else if (subset_compare (this_arg, "elide")) + flags |= PRINT_ELIDE; else { /* Not a recognized argument, so stop. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c4d5b79..f9f48c5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-25 Tom Tromey + + PR backtrace/15582: + * gdb.python/py-framefilter.exp: Add "bt elide" test. + 2017-04-19 Pedro Alves * gdb.threads/threadapply.exp (kill_and_remove_inferior): New diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp index bbec48d..80aa495 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -157,6 +157,9 @@ gdb_test "bt no-filter full" \ gdb_test "bt full" \ ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*#22.*in func1 \\(\\).*#23.*in func2 \\(f=3\\).*elided = $hex \"Elided frame\".*fb = \{nothing = $hex \"Elided Foo Bar\", f = 84, s = 38\}.*bf = $hex.*" \ "bt full with Reverse disabled" +gdb_test "bt full elide" \ + ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*#22.*in func1 \\(\\)\[^#\]*#24.*in func3 \\(i=3\\).*" \ + "bt full elide with Reverse disabled" # Test set print frame-arguments # none