From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 42331 invoked by alias); 23 Apr 2017 16:04:55 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 42302 invoked by uid 89); 23 Apr 2017 16:04:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.9 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=H*Ad:U*tom, 5*, H*RU:67.222.38.55, H*RU:cmgw4 X-HELO: gproxy5.mail.unifiedlayer.com Received: from gproxy5-pub.mail.unifiedlayer.com (HELO gproxy5.mail.unifiedlayer.com) (67.222.38.55) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Apr 2017 16:04:51 +0000 Received: from cmgw4 (unknown [10.0.90.85]) by gproxy5.mail.unifiedlayer.com (Postfix) with ESMTP id E718414069A for ; Sun, 23 Apr 2017 10:04:51 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id Bs4o1v00Q2f2jeq01s4rup; Sun, 23 Apr 2017 10:04:51 -0600 X-Authority-Analysis: v=2.2 cv=QdwWhoTv c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=AzvcPWV-tVgA:10 a=zstS-IiYAAAA:8 a=20KFwNOVAAAA:8 a=rQ-AkEj1ZJq4LOyFYBcA:9 a=lkUt1jIRiH9E5U9b:21 a=-4fcpzSiMtGBJpBk:21 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from c-67-176-62-53.hsd1.co.comcast.net ([67.176.62.53]:32802 helo=bapiya.hsd1.co.comcast.net) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1d2K0G-0006zw-Gd; Sun, 23 Apr 2017 10:04:48 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA] Make "bt N" print correct number of frames when using a frame filter Date: Sun, 23 Apr 2017 16:04:00 -0000 Message-Id: <20170423160446.17062-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1d2K0G-0006zw-Gd X-Source-Sender: c-67-176-62-53.hsd1.co.comcast.net (bapiya.hsd1.co.comcast.net) [67.176.62.53]:32802 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-SW-Source: 2017-04/txt/msg00630.txt.bz2 PR python/16497 notes that using "bt" with a positive argument prints the wrong number of frames when a frame filter is in use. Also, in this case, the non-frame-filter path will print a message about "More stack frames" when there are more; but this is not done in the frame-filter case. The first problem is that backtrace_command_1 passes the wrong value to apply_ext_lang_frame_filter -- that function takes the final frame's number as an argument, but backtrace_command_1 passes the count, which is off by one. The solution to the second problem is to have the C stack-printing code stop at the correct number of frames and then print the message. Tested using the buildbot. ChangeLog 2017-04-22 Tom Tromey PR python/16497: * stack.c (backtrace_command_1): Set PRINT_MORE_FRAMES flag. Fix off-by-one in py_end computation. * python/py-framefilter.c (gdbpy_apply_frame_filter): Handle PRINT_MORE_FRAMES. * extension.h (enum frame_filter_flags) : New constant. testsuite/ChangeLog 2017-04-22 Tom Tromey PR python/16497: * gdb.python/py-framefilter.exp: Update test. --- gdb/ChangeLog | 10 ++++++++++ gdb/extension.h | 3 +++ gdb/python/py-framefilter.c | 25 +++++++++++++++++++++++++ gdb/stack.c | 6 +++++- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.python/py-framefilter.exp | 2 +- 6 files changed, 49 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 28ae0a7..85d5da5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2017-04-22 Tom Tromey + PR python/16497: + * stack.c (backtrace_command_1): Set PRINT_MORE_FRAMES flag. Fix + off-by-one in py_end computation. + * python/py-framefilter.c (gdbpy_apply_frame_filter): Handle + PRINT_MORE_FRAMES. + * extension.h (enum frame_filter_flags) : New + constant. + +2017-04-22 Tom Tromey + * mi/mi-cmd-file.c (mi_cmd_file_list_shared_libraries): Use ui_out_emit_list. * stack.c (print_frame): Use ui_out_emit_list. diff --git a/gdb/extension.h b/gdb/extension.h index 2c79411..cda2ebf 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 a "More frames" message is to be printed. */ + PRINT_MORE_FRAMES = 16, }; /* 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..b604d51 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -1355,6 +1355,18 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang, gdbpy_enter enter_py (gdbarch, current_language); + /* When we're limiting the number of frames, be careful to request + one extra frame, so that we can print a message if there are more + frames. */ + int frame_countdown = -1; + if ((flags & PRINT_MORE_FRAMES) != 0 && frame_low >= 0 && frame_high >= 0) + { + ++frame_high; + /* This has an extra +1 because it is checked before a frame is + printed. */ + frame_countdown = frame_high - frame_low + 1; + } + gdbpy_ref<> iterable (bootstrap_python_frame_filters (frame, frame_low, frame_high)); @@ -1402,6 +1414,19 @@ gdbpy_apply_frame_filter (const struct extension_language_defn *extlang, break; } + if (frame_countdown != -1) + { + assert ((flags & PRINT_MORE_FRAMES) != 0); + --frame_countdown; + if (frame_countdown == 0) + { + /* We've printed all the frames we were asked to + print, but more frames existed. */ + printf_filtered (_("(More stack frames follow...)\n")); + break; + } + } + success = py_print_frame (item.get (), flags, args_type, out, 0, levels_printed.get ()); diff --git a/gdb/stack.c b/gdb/stack.c index 7f8a51c..37e8767 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1766,7 +1766,9 @@ backtrace_command_1 (char *count_exp, int show_locals, int no_filters, else { py_start = 0; - py_end = count; + /* The argument to apply_ext_lang_frame_filter is the number + of the final frame to print, and frames start at 0. */ + py_end = count - 1; } } else @@ -1800,6 +1802,8 @@ backtrace_command_1 (char *count_exp, int show_locals, int no_filters, if (show_locals) flags |= PRINT_LOCALS; + if (from_tty) + flags |= PRINT_MORE_FRAMES; if (!strcmp (print_frame_arguments, "scalars")) arg_type = CLI_SCALAR_VALUES; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c4d5b79..df883da 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-04-22 Tom Tromey + + PR python/16497: + * gdb.python/py-framefilter.exp: Update 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..d81d144 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -149,7 +149,7 @@ gdb_test "bt -2" \ ".*#26.*func5.*#27.*in main \\(\\).*" \ "bt -2 with frame-filter Reverse disabled" gdb_test "bt 3" \ - ".*#0.*end_func.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*" \ + ".*#0.*end_func.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\)\[^#\]*More stack frames follow.*" \ "bt 3 with frame-filter Reverse disabled" gdb_test "bt no-filter 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\}.*" \ -- 2.9.3