[tip:perf/core] perf hists: Separate sort fields parsing into setup_sort_list function

Path	csiph.com!weretis.net!feeder6.news.weretis.net!2.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Jiri Olsa <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:perf/core] perf hists: Separate sort fields parsing into setup_sort_list function
Date	Thu, 04 Feb 2016 13:40:04 +0100
Message-ID	<qYrmA-da-45@gated-at.bofh.it> (permalink)
References	<qSein-73y-43@gated-at.bofh.it>
Reply-To	jolsa@kernel.org, dsahern@gmail.com, acme@redhat.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, tglx@linutronix.de
Git-Commit-ID	2fbaa39079672bf52a9208ec1263385b48933cc3
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> to get blacklisted from these emails
MIME-Version	1.0
Content-Transfer-Encoding	8bit
Content-Type	text/plain; charset=UTF-8
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	82
Organization	linux.* mail to news gateway
X-Original-Cc	jolsa@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, a.p.zijlstra@chello.nl, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, tglx@linutronix.de
X-Original-Date	Thu, 4 Feb 2016 04:37:33 -0800
X-Original-Message-ID	<tip-2fbaa39079672bf52a9208ec1263385b48933cc3@git.kernel.org>
X-Original-References	<1453109064-1026-13-git-send-email-jolsa@kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1326743

Show key headers only | View raw

Commit-ID:  2fbaa39079672bf52a9208ec1263385b48933cc3
Gitweb:     http://git.kernel.org/tip/2fbaa39079672bf52a9208ec1263385b48933cc3
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 18 Jan 2016 10:24:10 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 3 Feb 2016 12:24:09 -0300

perf hists: Separate sort fields parsing into setup_sort_list function

Separating sort fields parsing into setup_sort_list function, so it's
separated from sort_order string setup and could be reused later in
following patches.

Signed-off-by: Jiri 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/1453109064-1026-13-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/sort.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index b5389a5..ab1c21a 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2241,6 +2241,26 @@ static int sort_dimension__add(const char *tok,
 	return -ESRCH;
 }
 
+static int setup_sort_list(char *str, struct perf_evlist *evlist)
+{
+	char *tmp, *tok;
+	int ret = 0;
+
+	for (tok = strtok_r(str, ", ", &tmp);
+			tok; tok = strtok_r(NULL, ", ", &tmp)) {
+		ret = sort_dimension__add(tok, evlist);
+		if (ret == -EINVAL) {
+			error("Invalid --sort key: `%s'", tok);
+			break;
+		} else if (ret == -ESRCH) {
+			error("Unknown --sort key: `%s'", tok);
+			break;
+		}
+	}
+
+	return ret;
+}
+
 static const char *get_default_sort_order(struct perf_evlist *evlist)
 {
 	const char *default_sort_orders[] = {
@@ -2335,7 +2355,7 @@ static char *setup_overhead(char *keys)
 
 static int __setup_sorting(struct perf_evlist *evlist)
 {
-	char *tmp, *tok, *str;
+	char *str;
 	const char *sort_keys;
 	int ret = 0;
 
@@ -2373,17 +2393,7 @@ static int __setup_sorting(struct perf_evlist *evlist)
 		}
 	}
 
-	for (tok = strtok_r(str, ", ", &tmp);
-			tok; tok = strtok_r(NULL, ", ", &tmp)) {
-		ret = sort_dimension__add(tok, evlist);
-		if (ret == -EINVAL) {
-			error("Invalid --sort key: `%s'", tok);
-			break;
-		} else if (ret == -ESRCH) {
-			error("Unknown --sort key: `%s'", tok);
-			break;
-		}
-	}
+	ret = setup_sort_list(str, evlist);
 
 	free(str);
 	return ret;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[tip:perf/core] perf hists:   Separate sort fields parsing into setup_sort_list function tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-02-04 13:40 +0100

csiph-web