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

perf hist: Remove output field from sort-list properly 



When it removes an output format for cancelled children or latency, it
should delete itself from the sort list as well.  Otherwise assertion
in fmt_free() will fire.

  $ perf report -H --stdio
  perf: ui/hist.c:603: fmt_free: Assertion `!(!list_empty(&fmt->sort_list))' failed.
  Aborted (core dumped)

Also convert to perf_hpp__column_unregister() for the same open codes.

Committer notes:

Before this patch:

  # perf test hierarchy
   83: perf report --hierarchy                                         : FAILED!
  # perf test -v hierarchy
  --- start ---
  test child forked, pid 102242
  perf report --hierarchy
  Linux
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 0.025 MB /tmp/perf-test-report.HX0N85TlPq/perf-report-hierarchy-perf.data (6 samples) ]
  perf: ui/hist.c:603: fmt_free: Assertion `!(!list_empty(&fmt->sort_list))' failed.
  /home/acme/libexec/perf-core/tests/shell/perf-report-hierarchy.sh: line 34: 102250 Aborted                 (core dumped) perf report --hierarchy > /dev/null
  --- Cleaning up ---
  ---- end(-1) ----
   83: perf report --hierarchy                                         : FAILED!
  #

After:

  # perf test hierarchy
   83: perf report --hierarchy                                         : Ok
  #

Fixes: dbd11b6b ("perf hist: Remove formats in hierarchy when cancel children")
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250430180321.736939-1-namhyung@kernel.org


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

tools/perf/ui/hist.c

+5 −10
Original line number Diff line number Diff line
@@ -696,6 +696,7 @@ void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list, 
static void perf_hpp__column_unregister(struct perf_hpp_fmt *format)

{

	list_del_init(&format->list);

	list_del_init(&format->sort_list);

	fmt_free(format);

}
@@ -818,18 +819,12 @@ void perf_hpp__reset_output_field(struct perf_hpp_list *list) 
	struct perf_hpp_fmt *fmt, *tmp;



	/* reset output fields */

	perf_hpp_list__for_each_format_safe(list, fmt, tmp) {

		list_del_init(&fmt->list);

		list_del_init(&fmt->sort_list);

		fmt_free(fmt);

	}

	perf_hpp_list__for_each_format_safe(list, fmt, tmp)

		perf_hpp__column_unregister(fmt);



	/* reset sort keys */

	perf_hpp_list__for_each_sort_list_safe(list, fmt, tmp) {

		list_del_init(&fmt->list);

		list_del_init(&fmt->sort_list);

		fmt_free(fmt);

	}

	perf_hpp_list__for_each_sort_list_safe(list, fmt, tmp)

		perf_hpp__column_unregister(fmt);

}



/*