perf stat: Remove setup_events function (a454742c) · Commits · 戴 / test

tools/perf/builtin-stat.c

+7 −20

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,8 @@ static void print_counter(struct perf_evsel counter, char prefix);
	static void print_aggr(char *prefix);		static void print_aggr(char *prefix);

	/* Default events used for perf stat -T */		/* Default events used for perf stat -T */
	static const char * const transaction_attrs[] = {		static const char *transaction_attrs = {
	"task-clock",		"task-clock,"
	"{"		"{"
	"instructions,"		"instructions,"
	"cycles,"		"cycles,"
	@@ -86,8 +86,8 @@ static const char * const transaction_attrs[] = {
	};		};

	/* More limited version when the CPU does not have all events. */		/* More limited version when the CPU does not have all events. */
	static const char * const transaction_limited_attrs[] = {		static const char * transaction_limited_attrs = {
	"task-clock",		"task-clock,"
	"{"		"{"
	"instructions,"		"instructions,"
	"cycles,"		"cycles,"
	@@ -1533,17 +1533,6 @@ static int perf_stat_init_aggr_mode(void)
	return 0;		return 0;
	}		}

	static int setup_events(const char * const *attrs, unsigned len)
	{
	unsigned i;

	for (i = 0; i < len; i++) {
	if (parse_events(evsel_list, attrs[i], NULL))
	return -1;
	}
	return 0;
	}

	/*		/*
	* Add default attributes, if there were no attributes specified or		* Add default attributes, if there were no attributes specified or
	* if -d/--detailed, -d -d or -d -d -d is used:		* if -d/--detailed, -d -d or -d -d -d is used:
	@@ -1665,12 +1654,10 @@ static int add_default_attributes(void)
	int err;		int err;
	if (pmu_have_event("cpu", "cycles-ct") &&		if (pmu_have_event("cpu", "cycles-ct") &&
	pmu_have_event("cpu", "el-start"))		pmu_have_event("cpu", "el-start"))
	err = setup_events(transaction_attrs,		err = parse_events(evsel_list, transaction_attrs, NULL);
	ARRAY_SIZE(transaction_attrs));
	else		else
	err = setup_events(transaction_limited_attrs,		err = parse_events(evsel_list, transaction_limited_attrs, NULL);
	ARRAY_SIZE(transaction_limited_attrs));		if (err) {
	if (err < 0) {
	fprintf(stderr, "Cannot set up transaction events\n");		fprintf(stderr, "Cannot set up transaction events\n");
	return -1;		return -1;
	}		}

Admin message