Skip to contentSkip to conversation

perf hists: Remove hist_entry->used, not used anymore

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Mar 22, 2015 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  4c47f4fcd60a2f4153d6fe0c31650fbec112a1bd
Gitweb:     http://git.kernel.org/tip/4c47f4fcd60a2f4153d6fe0c31650fbec112a1bd
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 17 Mar 2015 17:18:58 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 17 Mar 2015 17:18:58 -0300

perf hists: Remove hist_entry->used, not used anymore

Since hist_entry__delete() nowadays doesn't actually frees anything that may be in use by the annotation code.

Eventually we will solve this for good by reference counting struct symbol.

Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Stephane Eranian <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/ui/browsers/hists.c | 5 -----
 tools/perf/util/hist.c         | 8 +-------
 tools/perf/util/sort.h         | 1 -
 3 files changed, 1 insertion(+), 13 deletions(-)
tools/perf/ui/browsers/hists.c +0 -5
index ebd9d3a..c37e70a 100644
@@ -1731,12 +1731,7 @@ do_annotate:
 			if (!notes->src)
 				continue;
 
-			/*
-			 * Don't let this be freed, say, by hists__decay_entry.
-			 */
-			he->used = true;
 			err = hist_entry__tui_annotate(he, evsel, hbt);
-			he->used = false;
 			/*
 			 * offer option to annotate the other branch source or target
 			 * (if they exists) when returning from annotate
tools/perf/util/hist.c +1 -7
index d9a6d35..cc22b91 100644
@@ -263,15 +263,9 @@ void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel)
 	while (next) {
 		n = rb_entry(next, struct hist_entry, rb_node);
 		next = rb_next(&n->rb_node);
-		/*
-		 * We may be annotating this, for instance, so keep it here in
-		 * case some it gets new samples, we'll eventually free it when
-		 * the user stops browsing and it agains gets fully decayed.
-		 */
 		if (((zap_user && n->level == '.') ||
 		     (zap_kernel && n->level != '.') ||
-		     hists__decay_entry(hists, n)) &&
-		    !n->used) {
+		     hists__decay_entry(hists, n))) {
 			hists__delete_entry(hists, n);
 		}
 	}
tools/perf/util/sort.h +0 -1
index c03e4ff..9c01b83 100644
@@ -102,7 +102,6 @@ struct hist_entry {
 
 	bool			init_have_children;
 	char			level;
-	bool			used;
 	u8			filtered;
 	char			*srcline;
 	struct symbol		*parent;