Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1567224 > unrolled thread
| Started by | Taeung Song <treeze.taeung@gmail.com> |
|---|---|
| First post | 2017-01-26 10:40 +0100 |
| Last post | 2017-01-26 20:00 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/3] perf ftrace: Remove needless code setting default tracer Taeung Song <treeze.taeung@gmail.com> - 2017-01-26 10:40 +0100
[PATCH 3/3] perf ftrace: Handle NULL at write_tracing_file() Taeung Song <treeze.taeung@gmail.com> - 2017-01-26 10:40 +0100
Re: [PATCH 1/3] perf ftrace: Remove needless code setting default tracer Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-01-26 20:00 +0100
| From | Taeung Song <treeze.taeung@gmail.com> |
|---|---|
| Date | 2017-01-26 10:40 +0100 |
| Subject | [PATCH 1/3] perf ftrace: Remove needless code setting default tracer |
| Message-ID | <t3OH8-5Cz-7@gated-at.bofh.it> |
Lately commit a349764 made 'function_graph' be the default tracer.
So ftrace.tracer variable can't be NULL but the other code setting default
tracer remained. For this reason, remove it as below.
And use existing DEFAULT_TRACER instead of "function_graph".
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/builtin-ftrace.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index d05658d..414444d 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -202,7 +202,7 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
{
int ret;
struct perf_ftrace ftrace = {
- .tracer = "function_graph",
+ .tracer = DEFAULT_TRACER,
.target = { .uid = UINT_MAX, },
};
const char * const ftrace_usage[] = {
@@ -231,9 +231,6 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
if (ret < 0)
goto out_delete_evlist;
- if (ftrace.tracer == NULL)
- ftrace.tracer = DEFAULT_TRACER;
-
ret = __cmd_ftrace(&ftrace, argc, argv);
out_delete_evlist:
--
2.7.4
[toc] | [next] | [standalone]
| From | Taeung Song <treeze.taeung@gmail.com> |
|---|---|
| Date | 2017-01-26 10:40 +0100 |
| Subject | [PATCH 3/3] perf ftrace: Handle NULL at write_tracing_file() |
| Message-ID | <t3OH8-5Cz-23@gated-at.bofh.it> |
| In reply to | #1567224 |
If a value for tracing file is NULL,
segment fault error can occur using strlen().
Of course, currently the function don't be given NULL value.
But write_tracing_file() can be generally used.
So add the if statement.
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/builtin-ftrace.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index 8df5416..0754dee 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -54,8 +54,12 @@ static int write_tracing_file(const char *name, const char *val)
{
char *file;
int fd, ret = -1;
- ssize_t size = strlen(val);
+ ssize_t size;
+ if (val == NULL)
+ return -1;
+
+ size = strlen(val);
file = get_tracing_file(name);
if (!file) {
pr_debug("cannot get tracing file: %s\n", name);
--
2.7.4
[toc] | [prev] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2017-01-26 20:00 +0100 |
| Subject | Re: [PATCH 1/3] perf ftrace: Remove needless code setting default tracer |
| Message-ID | <t3Xr3-2rI-1@gated-at.bofh.it> |
| In reply to | #1567224 |
Em Thu, Jan 26, 2017 at 06:35:37PM +0900, Taeung Song escreveu:
> Lately commit a349764 made 'function_graph' be the default tracer.
> So ftrace.tracer variable can't be NULL but the other code setting default
> tracer remained. For this reason, remove it as below.
> And use existing DEFAULT_TRACER instead of "function_graph".
Rewrote a bit the commit log, applied,
- Arnaldo
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
> ---
> tools/perf/builtin-ftrace.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
> index d05658d..414444d 100644
> --- a/tools/perf/builtin-ftrace.c
> +++ b/tools/perf/builtin-ftrace.c
> @@ -202,7 +202,7 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
> {
> int ret;
> struct perf_ftrace ftrace = {
> - .tracer = "function_graph",
> + .tracer = DEFAULT_TRACER,
> .target = { .uid = UINT_MAX, },
> };
> const char * const ftrace_usage[] = {
> @@ -231,9 +231,6 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
> if (ret < 0)
> goto out_delete_evlist;
>
> - if (ftrace.tracer == NULL)
> - ftrace.tracer = DEFAULT_TRACER;
> -
> ret = __cmd_ftrace(&ftrace, argc, argv);
>
> out_delete_evlist:
> --
> 2.7.4
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web