Эх сурвалжийг харах

perf hists: Move column length calculation out of hists__inc_stats()

It's not the part of logic of hists__inc_stats() so it'd be better to
move it out of the function.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1398327843-31845-4-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Namhyung Kim 11 жил өмнө
parent
commit
ae993efc9c

+ 3 - 0
tools/perf/builtin-diff.c

@@ -587,6 +587,9 @@ static void hists__compute_resort(struct hists *hists)
 
 
 		insert_hist_entry_by_compute(&hists->entries, he, compute);
 		insert_hist_entry_by_compute(&hists->entries, he, compute);
 		hists__inc_stats(hists, he);
 		hists__inc_stats(hists, he);
+
+		if (!he->filtered)
+			hists__calc_col_len(hists, he);
 	}
 	}
 }
 }
 
 

+ 3 - 1
tools/perf/util/hist.c

@@ -320,7 +320,6 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
 void hists__inc_stats(struct hists *hists, struct hist_entry *h)
 void hists__inc_stats(struct hists *hists, struct hist_entry *h)
 {
 {
 	if (!h->filtered) {
 	if (!h->filtered) {
-		hists__calc_col_len(hists, h);
 		hists->nr_non_filtered_entries++;
 		hists->nr_non_filtered_entries++;
 		hists->stats.total_non_filtered_period += h->stat.period;
 		hists->stats.total_non_filtered_period += h->stat.period;
 	}
 	}
@@ -687,6 +686,9 @@ void hists__output_resort(struct hists *hists)
 
 
 		__hists__insert_output_entry(&hists->entries, n, min_callchain_hits);
 		__hists__insert_output_entry(&hists->entries, n, min_callchain_hits);
 		hists__inc_stats(hists, n);
 		hists__inc_stats(hists, n);
+
+		if (!n->filtered)
+			hists__calc_col_len(hists, n);
 	}
 	}
 }
 }