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

Commit 6733d1bf authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf hists: Rename hist_entry__free to __delete 

No logic changes, just to be consistent.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-f7n5y0mvk6gew5185h6fg316@git.kernel.org


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

tools/perf/builtin-diff.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static void hists__baseline_only(struct hists *hists) 
		next = rb_next(&he->rb_node_in);

		if (!hist_entry__next_pair(he)) {

			rb_erase(&he->rb_node_in, root);

			hist_entry__free(he);

			hist_entry__delete(he);

		}

	}

}

tools/perf/tests/hists_cumulate.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void del_hist_entries(struct hists *hists) 
		he = rb_entry(node, struct hist_entry, rb_node);

		rb_erase(node, root_out);

		rb_erase(&he->rb_node_in, root_in);

		hist_entry__free(he);

		hist_entry__delete(he);

	}

}

tools/perf/tests/hists_output.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void del_hist_entries(struct hists *hists) 
		he = rb_entry(node, struct hist_entry, rb_node);

		rb_erase(node, root_out);

		rb_erase(&he->rb_node_in, root_in);

		hist_entry__free(he);

		hist_entry__delete(he);

	}

}

tools/perf/util/hist.c

+4 −4
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel) 
			if (!n->filtered)

				--hists->nr_non_filtered_entries;



			hist_entry__free(n);

			hist_entry__delete(n);

		}

	}

}
@@ -290,7 +290,7 @@ void hists__delete_entries(struct hists *hists) 
		if (!n->filtered)

			--hists->nr_non_filtered_entries;



		hist_entry__free(n);

		hist_entry__delete(n);

	}

}
@@ -941,7 +941,7 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right) 
	return cmp;

}



void hist_entry__free(struct hist_entry *he)

void hist_entry__delete(struct hist_entry *he)

{

	zfree(&he->branch_info);

	zfree(&he->mem_info);
@@ -981,7 +981,7 @@ static bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, 
						iter->callchain,

						he->callchain);

			}

			hist_entry__free(he);

			hist_entry__delete(he);

			return false;

		}

tools/perf/util/hist.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int64_t hist_entry__collapse(struct hist_entry *left, struct hist_entry *right); 
int hist_entry__transaction_len(void);

int hist_entry__sort_snprintf(struct hist_entry *he, char *bf, size_t size,

			      struct hists *hists);

void hist_entry__free(struct hist_entry *);

void hist_entry__delete(struct hist_entry *he);



void hists__output_resort(struct hists *hists, struct ui_progress *prog);

void hists__collapse_resort(struct hists *hists, struct ui_progress *prog);