From: Don Zickus <dzickus@redhat.com>
To: acme@ghostprotocols.net
Cc: LKML <linux-kernel@vger.kernel.org>,
jolsa@redhat.com, jmario@redhat.com, fowles@inreach.com,
Don Zickus <dzickus@redhat.com>
Subject: [PATCH 4/4] perf, report: Use new generic report parse callchain callback
Date: Mon, 24 Mar 2014 15:32:57 -0400 [thread overview]
Message-ID: <1395689577-214654-5-git-send-email-dzickus@redhat.com> (raw)
In-Reply-To: <1395689577-214654-1-git-send-email-dzickus@redhat.com>
Use the new routine.
Signed-off-by: Don Zickus <dzickus@redhat.com>
---
tools/perf/builtin-report.c | 77 +--------------------------------------------
1 file changed, 1 insertion(+), 76 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index c8f2113..c87412b 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -576,8 +576,6 @@ static int
parse_callchain_opt(const struct option *opt, const char *arg, int unset)
{
struct report *rep = (struct report *)opt->value;
- char *tok, *tok2;
- char *endptr;
/*
* --no-call-graph
@@ -587,80 +585,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
return 0;
}
- symbol_conf.use_callchain = true;
-
- if (!arg)
- return 0;
-
- tok = strtok((char *)arg, ",");
- if (!tok)
- return -1;
-
- /* get the output mode */
- if (!strncmp(tok, "graph", strlen(arg)))
- callchain_param.mode = CHAIN_GRAPH_ABS;
-
- else if (!strncmp(tok, "flat", strlen(arg)))
- callchain_param.mode = CHAIN_FLAT;
-
- else if (!strncmp(tok, "fractal", strlen(arg)))
- callchain_param.mode = CHAIN_GRAPH_REL;
-
- else if (!strncmp(tok, "none", strlen(arg))) {
- callchain_param.mode = CHAIN_NONE;
- symbol_conf.use_callchain = false;
-
- return 0;
- }
-
- else
- return -1;
-
- /* get the min percentage */
- tok = strtok(NULL, ",");
- if (!tok)
- goto setup;
-
- callchain_param.min_percent = strtod(tok, &endptr);
- if (tok == endptr)
- return -1;
-
- /* get the print limit */
- tok2 = strtok(NULL, ",");
- if (!tok2)
- goto setup;
-
- if (tok2[0] != 'c') {
- callchain_param.print_limit = strtoul(tok2, &endptr, 0);
- tok2 = strtok(NULL, ",");
- if (!tok2)
- goto setup;
- }
-
- /* get the call chain order */
- if (!strncmp(tok2, "caller", strlen("caller")))
- callchain_param.order = ORDER_CALLER;
- else if (!strncmp(tok2, "callee", strlen("callee")))
- callchain_param.order = ORDER_CALLEE;
- else
- return -1;
-
- /* Get the sort key */
- tok2 = strtok(NULL, ",");
- if (!tok2)
- goto setup;
- if (!strncmp(tok2, "function", strlen("function")))
- callchain_param.key = CCKEY_FUNCTION;
- else if (!strncmp(tok2, "address", strlen("address")))
- callchain_param.key = CCKEY_ADDRESS;
- else
- return -1;
-setup:
- if (callchain_register_param(&callchain_param) < 0) {
- pr_err("Can't register callchain params\n");
- return -1;
- }
- return 0;
+ return report_parse_callchain_opt(arg);
}
int
--
1.7.11.7
prev parent reply other threads:[~2014-03-24 19:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-24 19:32 [PATCH 0/4] perf: Make some functions generic Don Zickus
2014-03-24 19:32 ` [PATCH 1/4] perf: Allow ability to map cpus to nodes easily Don Zickus
2014-03-29 17:10 ` Jiri Olsa
2014-04-01 2:39 ` Don Zickus
2014-04-06 12:19 ` Jiri Olsa
2014-04-03 5:48 ` Namhyung Kim
2014-04-06 12:15 ` Jiri Olsa
2014-04-07 5:28 ` Namhyung Kim
2014-04-07 18:20 ` Don Zickus
2014-03-24 19:32 ` [PATCH 2/4] perf, kmem: Utilize the new generic cpunode_map Don Zickus
2014-03-29 17:10 ` Jiri Olsa
2014-04-01 2:42 ` Don Zickus
2014-04-06 12:21 ` Jiri Olsa
2014-04-07 18:18 ` Don Zickus
2014-03-24 19:32 ` [PATCH 3/4] perf, callchain: Add generic report parse callchain callback function Don Zickus
2014-03-29 17:11 ` Jiri Olsa
2014-04-03 5:57 ` Namhyung Kim
2014-04-04 19:31 ` Don Zickus
2014-04-06 12:11 ` Jiri Olsa
2014-04-07 5:15 ` Namhyung Kim
2014-04-07 7:01 ` Jiri Olsa
2014-03-24 19:32 ` Don Zickus [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395689577-214654-5-git-send-email-dzickus@redhat.com \
--to=dzickus@redhat.com \
--cc=acme@ghostprotocols.net \
--cc=fowles@inreach.com \
--cc=jmario@redhat.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).