diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-16 13:46:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-16 13:46:34 +0200 |
| commit | f4aa84fc2a1c3a1ae1b81e434e8cde1c5f98a6b4 (patch) | |
| tree | 5cccbfb9ef7d5d848afe67740f5ca6fa1cf5fb04 /tools/perf/util/util.c | |
| parent | fbe26abe118ee1262b4ab0d12fefd42647eaea35 (diff) | |
| parent | 4414a3c51028aea2ae2fe06c0377490eaa6abbfd (diff) | |
| download | linux-f4aa84fc2a1c3a1ae1b81e434e8cde1c5f98a6b4.tar.gz linux-f4aa84fc2a1c3a1ae1b81e434e8cde1c5f98a6b4.tar.bz2 linux-f4aa84fc2a1c3a1ae1b81e434e8cde1c5f98a6b4.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
o Prep patches to support 'perf kvm stat' on s390 (Alexander Yarygin)
o Add pagefault statistics in 'trace' (Stanislav Fomichev)
o Add header for columns in 'top' and 'report' TUI browsers (Jiri Olsa)
o Add pagefault statistics in 'trace' (Stanislav Fomichev)
Build fixes:
o Fix build on 32-bit systems (Arnaldo Carvalho de Melo)
Cleanups:
o Convert open coded equivalents to asprintf() (Andy Shevchenko)
Plumbing changes:
o Allow reserving a row for header purposes in the hists browser (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/util.c')
| -rw-r--r-- | tools/perf/util/util.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 95aefa78bb07..e4132aeeb780 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -333,12 +333,9 @@ const char *find_tracing_dir(void) if (!debugfs) return NULL; - tracing = malloc(strlen(debugfs) + 9); - if (!tracing) + if (asprintf(&tracing, "%s/tracing", debugfs) < 0) return NULL; - sprintf(tracing, "%s/tracing", debugfs); - tracing_found = 1; return tracing; } @@ -352,11 +349,9 @@ char *get_tracing_file(const char *name) if (!tracing) return NULL; - file = malloc(strlen(tracing) + strlen(name) + 2); - if (!file) + if (asprintf(&file, "%s/%s", tracing, name) < 0) return NULL; - sprintf(file, "%s/%s", tracing, name); return file; } |