Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abab5e7f authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Update column width of dynamic entries 



The column width of dynamic entries is updated when comparing hist
entries.  However some unique entries can miss the chance to update.  So
move the update to output resort stage to make sure every entry will get
called before display.

To do that, abuse ->sort callback to update the width when the third
argument is NULL.  When resorting entries in normal path, it never be
NULL so it should be fine IMHO.

Before:

  #       Overhead  ptr / bytes_req / gfp_flags
  # ..............  ..........................................
  #
      37.50%        0xffff8803f7669400
         37.50%        448
            37.50%        GFP_ATOMIC|GFP_NOWARN|GFP_NOMEMALLOC
      10.42%        0xffff8803f766be00
          8.33%        96
             8.33%        GFP_ATOMIC|GFP_NOWARN|GFP_NOMEMALLOC
          2.08%        512
             2.08%        GFP_KERNEL|GFP_NOWARN|GFP_REPEAT|GFP   <-- here

After:

  #       Overhead  ptr / bytes_req / gfp_flags
  # ..............  .....................................................
  #
      37.50%        0xffff8803f7669400
         37.50%        448
            37.50%        GFP_ATOMIC|GFP_NOWARN|GFP_NOMEMALLOC
      10.42%        0xffff8803f766be00
          8.33%        96
             8.33%        GFP_ATOMIC|GFP_NOWARN|GFP_NOMEMALLOC
          2.08%        512
             2.08%        GFP_KERNEL|GFP_NOWARN|GFP_REPEAT|GFP_NOMEMALLOC

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1456512767-1164-5-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e049d4a3

tools/perf/util/hist.c

+11 −0
Original line number Diff line number Diff line
@@ -1371,6 +1371,10 @@ static void hierarchy_insert_output_entry(struct rb_root *root, 


	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, root);



	/* update column width of dynamic entry */

	if (perf_hpp__is_dynamic_entry(he->fmt))

		he->fmt->sort(he->fmt, he, NULL);

}



static void hists__hierarchy_output_resort(struct hists *hists,
@@ -1440,6 +1444,7 @@ static void __hists__insert_output_entry(struct rb_root *entries, 
	struct rb_node **p = &entries->rb_node;

	struct rb_node *parent = NULL;

	struct hist_entry *iter;

	struct perf_hpp_fmt *fmt;



	if (use_callchain) {

		if (callchain_param.mode == CHAIN_GRAPH_REL) {
@@ -1466,6 +1471,12 @@ static void __hists__insert_output_entry(struct rb_root *entries, 


	rb_link_node(&he->rb_node, parent, p);

	rb_insert_color(&he->rb_node, entries);



	perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {

		if (perf_hpp__is_dynamic_entry(fmt) &&

		    perf_hpp__defined_dynamic_entry(fmt, he->hists))

			fmt->sort(fmt, he, NULL);  /* update column width */

	}

}



static void output_resort(struct hists *hists, struct ui_progress *prog,

tools/perf/util/sort.c

+5 −3
Original line number Diff line number Diff line
@@ -1816,6 +1816,11 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt, 


	hde = container_of(fmt, struct hpp_dynamic_entry, hpp);



	if (b == NULL) {

		update_dynamic_len(hde, a);

		return 0;

	}



	field = hde->field;

	if (field->flags & FIELD_IS_DYNAMIC) {

		unsigned long long dyn;
@@ -1830,9 +1835,6 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt, 
	} else {

		offset = field->offset;

		size = field->size;



		update_dynamic_len(hde, a);

		update_dynamic_len(hde, b);

	}



	return memcmp(a->raw_data + offset, b->raw_data + offset, size);