From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15955 invoked by alias); 4 Mar 2013 17:43:28 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 15850 invoked by uid 9514); 4 Mar 2013 17:43:26 -0000 Date: Mon, 04 Mar 2013 17:43:00 -0000 Message-ID: <20130304174326.15826.qmail@sourceware.org> From: pmuldoon@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] pmuldoon/python-backtrace: Change "raw" modifier to "no-filters" X-Git-Refname: refs/heads/pmuldoon/python-backtrace X-Git-Reftype: branch X-Git-Oldrev: b8b48cb9f82600f5b16f06b68174b86cec80d09e X-Git-Newrev: a0f015bc2fc53c919f4c2f494cb3897de4794afd X-SW-Source: 2013-q1/txt/msg00232.txt.bz2 List-Id: The branch, pmuldoon/python-backtrace has been updated via a0f015bc2fc53c919f4c2f494cb3897de4794afd (commit) from b8b48cb9f82600f5b16f06b68174b86cec80d09e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit a0f015bc2fc53c919f4c2f494cb3897de4794afd Author: Phil Muldoon Date: Mon Mar 4 17:42:56 2013 +0000 Change "raw" modifier to "no-filters" ----------------------------------------------------------------------- Summary of changes: gdb/stack.c | 20 ++++++++++---------- gdb/testsuite/gdb.python/py-framefilter.exp | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) First 500 lines of diff: diff --git a/gdb/stack.c b/gdb/stack.c index 492b5bf..982d1af 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1652,7 +1652,7 @@ frame_info (char *addr_exp, int from_tty) frames. */ static void -backtrace_command_1 (char *count_exp, int show_locals, int raw, +backtrace_command_1 (char *count_exp, int show_locals, int no_filters, int from_tty) { struct frame_info *fi; @@ -1731,7 +1731,7 @@ backtrace_command_1 (char *count_exp, int show_locals, int raw, } } - if (! raw) + if (! no_filters) { int flags = PRINT_LEVEL | PRINT_FRAME_INFO | PRINT_ARGS; enum py_frame_args arg_type; @@ -1751,7 +1751,7 @@ backtrace_command_1 (char *count_exp, int show_locals, int raw, } /* Run the inbuilt backtrace if there are no filters registered, or if there was an error in the Python backtracing output. */ - if (raw || result == PY_BT_ERROR || result == PY_BT_NO_FILTERS) + if (no_filters || result == PY_BT_ERROR || result == PY_BT_NO_FILTERS) { for (i = 0, fi = trailing; fi && count--; i++, fi = get_prev_frame (fi)) { @@ -1805,7 +1805,7 @@ static void backtrace_command (char *arg, int from_tty) { struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); - int fulltrace_arg = -1, arglen = 0, argc = 0, raw_arg = -1; + int fulltrace_arg = -1, arglen = 0, argc = 0, no_filters = -1; int user_arg = 0; if (arg) @@ -1823,8 +1823,8 @@ backtrace_command (char *arg, int from_tty) for (j = 0; j < strlen (argv[i]); j++) argv[i][j] = tolower (argv[i][j]); - if (raw_arg < 0 && subset_compare (argv[i], "raw")) - raw_arg = argc; + if (no_filters < 0 && subset_compare (argv[i], "no-filters")) + no_filters = argc; else { if (fulltrace_arg < 0 && subset_compare (argv[i], "full")) @@ -1838,7 +1838,7 @@ backtrace_command (char *arg, int from_tty) argc++; } arglen += user_arg; - if (fulltrace_arg >= 0 || raw_arg >= 0) + if (fulltrace_arg >= 0 || no_filters >= 0) { if (arglen > 0) { @@ -1847,7 +1847,7 @@ backtrace_command (char *arg, int from_tty) arg[0] = 0; for (i = 0; i < argc; i++) { - if (i != fulltrace_arg && i != raw_arg) + if (i != fulltrace_arg && i != no_filters) { strcat (arg, argv[i]); strcat (arg, " "); @@ -1860,7 +1860,7 @@ backtrace_command (char *arg, int from_tty) } backtrace_command_1 (arg, fulltrace_arg >= 0 /* show_locals */, - raw_arg >= 0 /* no frame-filters */, from_tty); + no_filters >= 0 /* no frame-filters */, from_tty); do_cleanups (old_chain); } @@ -2603,7 +2603,7 @@ It can be a stack frame number or the address of the frame.\n")); Print backtrace of all stack frames, or innermost COUNT frames.\n\ With a negative argument, print outermost -COUNT frames.\nUse of the \ 'full' qualifier also prints the values of the local variables.\n\ -Use of the 'raw' qualifier prohibits frame filters from executing\n\ +Use of the 'no-filters' qualifier prohibits frame filters from executing\n\ on this backtrace.\n")); add_com_alias ("bt", "backtrace", class_stack, 0); if (xdb_commands) diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp index 18e7845..1bdcd34 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2012, 2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -81,8 +81,8 @@ gdb_test_no_output "enable frame-filter global Elider" gdb_test "info frame-filter" \ ".*1000.*Yes.*Elider.*100.*Yes.*Reverse.*10.*.*No.*Object.*1.*" -# Test raw -gdb_test "bt raw" \ +# Test no-filters +gdb_test "bt no-filters" \ ".*#0.*end_func.*#22.*in func1.*#27.*in main \\(\\).*" # Test reverse @@ -100,7 +100,7 @@ gdb_test "bt -2" \ gdb_test "bt 3" \ ".*#0.*end_func.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*" -gdb_test "bt raw full" \ +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\}.*" gdb_test "bt full" \ @@ -109,35 +109,35 @@ gdb_test "bt full" \ # Test set print frame-arguments # none gdb_test_no_output "set print frame-arguments none" "turn off frame arguments" -gdb_test "bt raw 1" \ +gdb_test "bt no-filter 1" \ "#0.*end_func \\(foo=\.\.\., bar=\.\.\., fb=\.\.\., bf=\.\.\.\\) at .*py-framefilter.c.*" \ - "bt raw no args" + "bt no-filter no args" gdb_test "bt 1" \ "#0.*end_func \\(foo=\.\.\., bar=\.\.\., fb=\.\.\., bf=\.\.\.\\) at .*py-framefilter.c.*" \ "bt full no args" # scalars gdb_test_no_output "set print frame-arguments scalars" "turn off frame arguments" -gdb_test "bt raw 1" \ +gdb_test "bt no-filter 1" \ "#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\.\.\.\\) at .*py-framefilter.c.*" \ - "bt raw scalars" + "bt no-filter scalars" gdb_test "bt 1" \ "#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\.\.\.\\) at .*py-framefilter.c.*" \ "bt scalars" # all gdb_test_no_output "set print frame-arguments all" "turn off frame arguments" -gdb_test "bt raw 1" \ +gdb_test "bt no-filter 1" \ "#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\{nothing = $hex \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \ - "bt raw all args" + "bt no-filter all args" gdb_test "bt 1" \ "#0.*end_func \\(foo=21, bar=$hex \"Param\", fb=$hex, bf=\{nothing = $hex \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \ "bt all args" # set print address off gdb_test_no_output "set print address off" "turn off address printing" -gdb_test "bt raw 1" \ +gdb_test "bt no-filter 1" \ "#0 end_func \\(foo=21, bar=\"Param\", fb=, bf=\{nothing = \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \ - "bt raw no address" + "bt no-filter no address" gdb_test "bt 1" \ "#0 end_func \\(foo=21, bar=\"Param\", fb=, bf=\{nothing = \"Foo Bar\", f = 42, s = 19\}\\) at .*py-framefilter.c.*" \ "bt no addresss" hooks/post-receive -- Repository for Project Archer.