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

perf metric: Rename __metricgroup__add_metric to __add_metric 



Renaming __metricgroup__add_metric to __add_metric to fit in the current
function names.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200719181320.785305-8-jolsa@kernel.org


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

tools/perf/util/metricgroup.c

+6 −11
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ int __weak arch_get_runtimeparam(void) 
	return 1;

}



static int __metricgroup__add_metric(struct list_head *group_list,

static int __add_metric(struct list_head *group_list,

			struct pmu_event *pe,

			bool metric_no_group,

			int runtime)
@@ -634,10 +634,7 @@ static int add_metric(struct list_head *group_list, 
	pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);



	if (!strstr(pe->metric_expr, "?")) {

		ret = __metricgroup__add_metric(group_list,

						pe,

						metric_no_group,

						1);

		ret = __add_metric(group_list, pe, metric_no_group, 1);

	} else {

		int j, count;
@@ -649,9 +646,7 @@ static int add_metric(struct list_head *group_list, 
		 */



		for (j = 0; j < count && !ret; j++) {

			ret = __metricgroup__add_metric(

				group_list, pe,

				metric_no_group, j);

			ret = __add_metric(group_list, pe, metric_no_group, j);

		}

	}