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

Commit 0102ef3e authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Rename __hists__add_entry to hists__add_entry 



There's no reason we should suffer the '__' prefix for the base global
function.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1465928361-2442-12-git-send-email-jolsa@kernel.org


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

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel, 
	sample->period = 1;

	sample->weight = 1;



	he = __hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);

	he = hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);

	if (he == NULL)

		return -ENOMEM;

tools/perf/builtin-diff.c

+1 −11
Original line number Diff line number Diff line
@@ -310,16 +310,6 @@ static int formula_fprintf(struct hist_entry *he, struct hist_entry *pair, 
	return -1;

}



static int hists__add_entry(struct hists *hists,

			    struct addr_location *al,

			    struct perf_sample *sample)

{

	if (__hists__add_entry(hists, al, NULL, NULL, NULL,

			       sample, true) != NULL)

		return 0;

	return -ENOMEM;

}



static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,

				      union perf_event *event,

				      struct perf_sample *sample,
@@ -336,7 +326,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused, 
		return -1;

	}



	if (hists__add_entry(hists, &al, sample)) {

	if (!hists__add_entry(hists, &al, NULL, NULL, NULL, sample, true)) {

		pr_warning("problem incrementing symbol period, skipping event\n");

		goto out_put;

	}

tools/perf/tests/hists_link.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine) 
			if (machine__resolve(machine, &al, &sample) < 0)

				goto out;



			he = __hists__add_entry(hists, &al, NULL,

			he = hists__add_entry(hists, &al, NULL,

						NULL, NULL, &sample, true);

			if (he == NULL) {

				addr_location__put(&al);
@@ -103,7 +103,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine) 
			if (machine__resolve(machine, &al, &sample) < 0)

				goto out;



			he = __hists__add_entry(hists, &al, NULL,

			he = hists__add_entry(hists, &al, NULL,

						NULL, NULL, &sample, true);

			if (he == NULL) {

				addr_location__put(&al);

tools/perf/util/hist.c

+17 −17
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists, 
	return he;

}



struct hist_entry *__hists__add_entry(struct hists *hists,

struct hist_entry *hists__add_entry(struct hists *hists,

				    struct addr_location *al,

				    struct symbol *sym_parent,

				    struct branch_info *bi,
@@ -622,7 +622,7 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter, struct addr_location *al 
	 */

	sample->period = cost;



	he = __hists__add_entry(hists, al, iter->parent, NULL, mi,

	he = hists__add_entry(hists, al, iter->parent, NULL, mi,

			      sample, true);

	if (!he)

		return -ENOMEM;
@@ -727,7 +727,7 @@ iter_add_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *a 
	sample->period = 1;

	sample->weight = bi->flags.cycles ? bi->flags.cycles : 1;



	he = __hists__add_entry(hists, al, iter->parent, &bi[i], NULL,

	he = hists__add_entry(hists, al, iter->parent, &bi[i], NULL,

			      sample, true);

	if (he == NULL)

		return -ENOMEM;
@@ -764,7 +764,7 @@ iter_add_single_normal_entry(struct hist_entry_iter *iter, struct addr_location 
	struct perf_sample *sample = iter->sample;

	struct hist_entry *he;



	he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,

	he = hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,

			      sample, true);

	if (he == NULL)

		return -ENOMEM;
@@ -825,7 +825,7 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter, 
	struct hist_entry *he;

	int err = 0;



	he = __hists__add_entry(hists, al, iter->parent, NULL, NULL,

	he = hists__add_entry(hists, al, iter->parent, NULL, NULL,

			      sample, true);

	if (he == NULL)

		return -ENOMEM;
@@ -900,7 +900,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, 
		}

	}



	he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,

	he = hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,

			      sample, false);

	if (he == NULL)

		return -ENOMEM;

tools/perf/util/hist.h

+7 −7
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ extern const struct hist_iter_ops hist_iter_branch; 
extern const struct hist_iter_ops hist_iter_mem;

extern const struct hist_iter_ops hist_iter_cumulative;



struct hist_entry *__hists__add_entry(struct hists *hists,

struct hist_entry *hists__add_entry(struct hists *hists,

				    struct addr_location *al,

				    struct symbol *parent,

				    struct branch_info *bi,