From: Peter Zijlstra <peterz@infradead.org>
To: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: changbin.du@intel.com, akpm@linux-foundation.org,
tglx@linutronix.de, pombredanne@nexb.com, neilb@suse.com,
linux-kernel@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH] scripts/faddr2line: show the code context
Date: Tue, 29 May 2018 19:25:26 +0200 [thread overview]
Message-ID: <20180529172526.GX12235@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20180529172430.GB12180@hirez.programming.kicks-ass.net>
On Tue, May 29, 2018 at 07:24:30PM +0200, Peter Zijlstra wrote:
> From: Peter Zijlstra (Intel) <peterz@infraded.org>
Shees, you'd figure I could type my own email address by now..
From: Peter Zijlstra (Intel) <peterz@infradead.org>
>
> Commit 6870c0165feaa5 ("scripts/faddr2line: show the code context")
> radically altered the output format of the faddr2line tool. And while
> the new list output format might have merrit it broke my vim usage and
> was hard to read.
>
> Make the new format optional; using a '--list' argument and attempt to
> make the output slightly easier to read by adding a little whitespace to
> separate the different files and explicitly mark the line in question.
>
> Cc: Changbin Du <changbin.du@intel.com>
> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
> Fixes: 6870c0165feaa5 ("scripts/faddr2line: show the code context")
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> scripts/faddr2line | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/faddr2line b/scripts/faddr2line
> index 1876a741087c..a0149db00be7 100755
> --- a/scripts/faddr2line
> +++ b/scripts/faddr2line
> @@ -56,7 +56,7 @@ command -v ${SIZE} >/dev/null 2>&1 || die "size isn't installed"
> command -v ${NM} >/dev/null 2>&1 || die "nm isn't installed"
>
> usage() {
> - echo "usage: faddr2line <object file> <func+offset> <func+offset>..." >&2
> + echo "usage: faddr2line [--list] <object file> <func+offset> <func+offset>..." >&2
> exit 1
> }
>
> @@ -166,15 +166,25 @@ __faddr2line() {
> local file_lines=$(${ADDR2LINE} -fpie $objfile $addr | sed "s; $dir_prefix\(\./\)*; ;")
> [[ -z $file_lines ]] && return
>
> + if [[ $LIST = 0 ]]; then
> + echo "$file_lines" | while read -r line
> + do
> + echo $line
> + done
> + DONE=1;
> + return
> + fi
> +
> # show each line with context
> echo "$file_lines" | while read -r line
> do
> + echo
> echo $line
> n=$(echo $line | sed 's/.*:\([0-9]\+\).*/\1/g')
> n1=$[$n-5]
> n2=$[$n+5]
> f=$(echo $line | sed 's/.*at \(.\+\):.*/\1/g')
> - awk 'NR>=strtonum("'$n1'") && NR<=strtonum("'$n2'") {printf("%d\t%s\n", NR, $0)}' $f
> + awk 'NR>=strtonum("'$n1'") && NR<=strtonum("'$n2'") { if (NR=='$n') printf(">%d<", NR); else printf(" %d ", NR); printf("\t%s\n", $0)}' $f
> done
>
> DONE=1
> @@ -185,6 +195,10 @@ __faddr2line() {
> [[ $# -lt 2 ]] && usage
>
> objfile=$1
> +
> +LIST=0
> +[[ "$objfile" == "--list" ]] && LIST=1 && shift && objfile=$1
> +
> [[ ! -f $objfile ]] && die "can't find objfile $objfile"
> shift
>
next prev parent reply other threads:[~2018-05-29 17:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 7:23 [PATCH] scripts/faddr2line: show the code context changbin.du
2018-05-29 16:03 ` Peter Zijlstra
2018-05-29 16:26 ` Peter Zijlstra
2018-05-29 17:07 ` Josh Poimboeuf
2018-05-29 17:24 ` Peter Zijlstra
2018-05-29 17:25 ` Peter Zijlstra [this message]
2018-05-29 22:01 ` NeilBrown
2018-06-04 2:06 ` Du, Changbin
2018-06-04 2:10 ` Du, Changbin
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=20180529172526.GX12235@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=changbin.du@intel.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.com \
--cc=pombredanne@nexb.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).