Re: [PATCH 4/4] perf evsel: Print branch filter state with -vv

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Wed, Oct 21, 2015 at 10:32:15AM +0200, Peter Zijlstra escreveu:
> On Tue, Oct 20, 2015 at 05:25:07PM -0300, Arnaldo Carvalho de Melo wrote:
> > From: Andi Kleen <ak@linux.intel.com>
> > 
> > Add a missing field to the perf_event_attr debug output.
> > 
> > Signed-off-by: Andi Kleen <ak@linux.intel.com>
> > Cc: Jiri Olsa <jolsa@kernel.org>
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Link: http://lkml.kernel.org/r/1445366797-30894-4-git-send-email-andi@firstfloor.org
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> > ---
> >  tools/perf/util/evsel.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> > index 8be867ccefe9..11bf3f2c51cd 100644
> > --- a/tools/perf/util/evsel.c
> > +++ b/tools/perf/util/evsel.c
> > @@ -1229,6 +1229,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
> >  	PRINT_ATTRf(config, p_hex);
> >  	PRINT_ATTRn("{ sample_period, sample_freq }", sample_period, p_unsigned);
> >  	PRINT_ATTRf(sample_type, p_sample_type);
> > +	PRINT_ATTRf(branch_sample_type, p_unsigned);
> >  	PRINT_ATTRf(read_format, p_read_format);
> 
> As said in the original thread, this is the wrong place, it should be
> between config2 and sample_regs_user.

Like below, right? Acked?

commit 528946c2fcb5cdd3b75b691b316b5bdeaa7d46d0
Author: Andi Kleen <ak@linux.intel.com>
Date:   Tue Oct 20 11:46:36 2015 -0700

    perf evsel: Print branch filter state with -vv
    
    Add a missing field to the perf_event_attr debug output.
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/1445366797-30894-4-git-send-email-andi@firstfloor.org
    [ Print it between config2 and sample_regs_user (peterz)]
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 8be867ccefe9..ab05fa52a5cd 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1262,6 +1262,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
 	PRINT_ATTRf(bp_type, p_unsigned);
 	PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex);
 	PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex);
+	PRINT_ATTRf(branch_sample_type, p_unsigned);
 	PRINT_ATTRf(sample_regs_user, p_hex);
 	PRINT_ATTRf(sample_stack_user, p_unsigned);
 	PRINT_ATTRf(clockid, p_signed);