perf version: some follow-up updates
cover perf version: some follow-up updates
1. Remove -DNO_LIBPERL and use -DHAVE_LIBPERL_SUPPORT in C code.
2. Remove -DNO_LIBPYTHON and use -DHAVE_LIBPYTHON_SUPPORT in C code.
3. Rename HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT.
4. Don't print "libaudit" line if HAVE_SYSCALL_TABLE_SUPPORT is available and add a line for HAVE_SYSCALL_TABLE_SUPPORT.
Jin Yao (3):
perf script: Use HAVE_LIBXXX_SUPPORT to replace NO_LIBXXX
perf: Rename HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT perf version: Print status for syscall_table
tools/perf/Makefile.config | 2 +- tools/perf/builtin-help.c | 2 +- tools/perf/builtin-script.c | 4 ++-- tools/perf/builtin-version.c | 3 +++ tools/perf/perf.c | 4 ++-- tools/perf/util/generate-cmdlist.sh | 2 +- tools/perf/util/syscalltbl.c | 6 +++--- tools/perf/util/trace-event-scripting.c | 4 ++-- 8 files changed, 15 insertions(+), 12 deletions(-)
Signature · 1 line
2.7.4
PATCH 2/3 perf: Rename HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT
To make consistent with other HAVE_XXX_SUPPORT in Makefile.config, this patch renames HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT and update the C code accordingly.
--- tools/perf/Makefile.config | 2 +- tools/perf/builtin-help.c | 2 +- tools/perf/perf.c | 4 ++-- tools/perf/util/generate-cmdlist.sh | 2 +- tools/perf/util/syscalltbl.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-)
tools/perf/Makefile.config +1 -1
@@ -68,7 +68,7 @@ ifeq ($(NO_PERF_REGS),0) endif ifneq ($(NO_SYSCALL_TABLE),1) - CFLAGS += -DHAVE_SYSCALL_TABLE + CFLAGS += -DHAVE_SYSCALL_TABLE_SUPPORT endif # So far there's only x86 and arm libdw unwind support merged in perf.
tools/perf/builtin-help.c +1 -1
@@ -439,7 +439,7 @@ int cmd_help(int argc, const char **argv)#ifdef HAVE_LIBELF_SUPPORT "probe",#endif -#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE ) +#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE_SUPPORT )"trace" , #endif NULL };
tools/perf/perf.c +2 -2
@@ -73,7 +73,7 @@ static struct cmd_struct commands[] = { { "lock", cmd_lock, 0 }, { "kvm", cmd_kvm, 0 }, { "test", cmd_test, 0 }, -#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE) +#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT) { "trace", cmd_trace, 0 }, #endif { "inject", cmd_inject, 0 },
@@ -491,7 +491,7 @@ int main(int argc, const char **argv) argv[0 ] = cmd; }if (strstarts (cmd,"trace" )) { -#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE ) +#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE_SUPPORT )setup_path (); argv[0 ] ="trace" ;return cmd_trace (argc, argv);
tools/perf/util/generate-cmdlist.sh +1 -1
@@ -38,7 +38,7 @@ do done echo "#endif /* HAVE_LIBELF_SUPPORT */" -echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)" +echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT)" sed -n -e 's/^perf-\([^ ]*\)[ ].* audit*/\1/p' command-list.txt | sort | while read cmd
tools/perf/util/syscalltbl.c +3 -3
@@ -17,7 +17,7 @@#include <stdlib.h> #include <linux/compiler.h> -#ifdef HAVE_SYSCALL_TABLE +#ifdef HAVE_SYSCALL_TABLE_SUPPORT #include <string.h> #include "string2.h" #include "util.h"
@@ -139,7 +139,7 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx); } -#else /* HAVE_SYSCALL_TABLE */ +#else /* HAVE_SYSCALL_TABLE_SUPPORT */ #include <libaudit.h>
@@ -176,4 +176,4 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g {return syscalltbl__strglobmatch_next (tbl, syscall_glob, idx); } -#endif /* HAVE_SYSCALL_TABLE */ +#endif /* HAVE_SYSCALL_TABLE_SUPPORT */
Signature · 1 line
2.7.4
tip-bot for Jin Yao
merge bot[tip:perf/urgent] perf tools: Rename HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT
perf tools: Rename HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT
Commit-ID: 22e9af4e94801bbdf6945e55db64b877be7c71b3 Gitweb: https://git.kernel.org/tip/22e9af4e94801bbdf6945e55db64b877be7c71b3 Author: Jin Yao <[email protected]> AuthorDate: Mon, 9 Apr 2018 18:26:48 +0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 12 Apr 2018 10:33:31 -0300
perf tools: Rename HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT
To be consistent with other HAVE_XXX_SUPPORT uses in Makefile.config, this patch renames HAVE_SYSCALL_TABLE to HAVE_SYSCALL_TABLE_SUPPORT and updates the C code accordingly.
--- tools/perf/Makefile.config | 2 +- tools/perf/builtin-help.c | 2 +- tools/perf/perf.c | 4 ++-- tools/perf/util/generate-cmdlist.sh | 2 +- tools/perf/util/syscalltbl.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-)
tools/perf/Makefile.config +1 -1
@@ -68,7 +68,7 @@ ifeq ($(NO_PERF_REGS),0) endif ifneq ($(NO_SYSCALL_TABLE),1) - CFLAGS += -DHAVE_SYSCALL_TABLE + CFLAGS += -DHAVE_SYSCALL_TABLE_SUPPORT endif # So far there's only x86 and arm libdw unwind support merged in perf.
tools/perf/builtin-help.c +1 -1
@@ -439,7 +439,7 @@ int cmd_help(int argc, const char **argv)#ifdef HAVE_LIBELF_SUPPORT "probe",#endif -#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE ) +#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE_SUPPORT )"trace" , #endif NULL };
tools/perf/perf.c +2 -2
@@ -73,7 +73,7 @@ static struct cmd_struct commands[] = { { "lock", cmd_lock, 0 }, { "kvm", cmd_kvm, 0 }, { "test", cmd_test, 0 }, -#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE) +#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT) { "trace", cmd_trace, 0 }, #endif { "inject", cmd_inject, 0 },
@@ -491,7 +491,7 @@ int main(int argc, const char **argv) argv[0 ] = cmd; }if (strstarts (cmd,"trace" )) { -#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE ) +#if defined(HAVE_LIBAUDIT_SUPPORT ) || defined(HAVE_SYSCALL_TABLE_SUPPORT )setup_path (); argv[0 ] ="trace" ;return cmd_trace (argc, argv);
tools/perf/util/generate-cmdlist.sh +1 -1
@@ -38,7 +38,7 @@ do done echo "#endif /* HAVE_LIBELF_SUPPORT */" -echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE)" +echo "#if defined(HAVE_LIBAUDIT_SUPPORT) || defined(HAVE_SYSCALL_TABLE_SUPPORT)" sed -n -e 's/^perf-\([^ ]*\)[ ].* audit*/\1/p' command-list.txt | sort | while read cmd
tools/perf/util/syscalltbl.c +3 -3
@@ -17,7 +17,7 @@#include <stdlib.h> #include <linux/compiler.h> -#ifdef HAVE_SYSCALL_TABLE +#ifdef HAVE_SYSCALL_TABLE_SUPPORT #include <string.h> #include "string2.h" #include "util.h"
@@ -139,7 +139,7 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g return syscalltbl__strglobmatch_next(tbl, syscall_glob, idx); } -#else /* HAVE_SYSCALL_TABLE */ +#else /* HAVE_SYSCALL_TABLE_SUPPORT */ #include <libaudit.h>
@@ -176,4 +176,4 @@ int syscalltbl__strglobmatch_first(struct syscalltbl *tbl, const char *syscall_g {return syscalltbl__strglobmatch_next (tbl, syscall_glob, idx); } -#endif /* HAVE_SYSCALL_TABLE */ +#endif /* HAVE_SYSCALL_TABLE_SUPPORT */
PATCH 3/3 perf version: Print status for syscall_table
In reply to Jin YaoThis patch doesn't print "libaudit" line if HAVE_SYSCALL_TABLE_SUPPORT is available and add a line for HAVE_SYSCALL_TABLE_SUPPORT.
For example,
$ ./perf -vv
perf version 4.13.rc5.gc2f8af9
dwarf: [ on ] # HAVE_DWARF_SUPPORT
dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT
glibc: [ on ] # HAVE_GLIBC_SUPPORT
gtk2: [ on ] # HAVE_GTK2_SUPPORT
syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT
libbfd: [ on ] # HAVE_LIBBFD_SUPPORT
libelf: [ on ] # HAVE_LIBELF_SUPPORT
libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT
numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT
libperl: [ on ] # HAVE_LIBPERL_SUPPORT
libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT
libslang: [ on ] # HAVE_SLANG_SUPPORT
libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT
libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT
libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT
zlib: [ on ] # HAVE_ZLIB_SUPPORT
lzma: [ on ] # HAVE_LZMA_SUPPORT
get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT
bpf: [ on ] # HAVE_LIBBPF_SUPPORTThe line "syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT" is new created.
--- tools/perf/builtin-version.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/builtin-version.c +3 -0
@@ -60,7 +60,10 @@ static void library_status(void)STATUS (HAVE_DWARF_GETLOCATIONS_SUPPORT , dwarf_getlocations);STATUS (HAVE_GLIBC_SUPPORT , glibc);STATUS (HAVE_GTK2_SUPPORT , gtk2); +#ifndef HAVE_SYSCALL_TABLE_SUPPORT STATUS (HAVE_LIBAUDIT_SUPPORT , libaudit); +#endif +STATUS (HAVE_SYSCALL_TABLE_SUPPORT , syscall_table);STATUS (HAVE_LIBBFD_SUPPORT , libbfd);STATUS (HAVE_LIBELF_SUPPORT , libelf);STATUS (HAVE_LIBNUMA_SUPPORT , libnuma);
Signature · 1 line
2.7.4
tip-bot for Jin Yao
merge bot[tip:perf/urgent] perf version: Print status for syscall_table
perf version: Print status for syscall_table
Commit-ID: 8a812bf552d98f6f887f860d3910f201b4a97b26 Gitweb: https://git.kernel.org/tip/8a812bf552d98f6f887f860d3910f201b4a97b26 Author: Jin Yao <[email protected]> AuthorDate: Mon, 9 Apr 2018 18:26:49 +0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 12 Apr 2018 10:33:34 -0300
perf version: Print status for syscall_table
This patch doesn't print "libaudit" line if HAVE_SYSCALL_TABLE_SUPPORT is available and add a line for HAVE_SYSCALL_TABLE_SUPPORT.
For example,
$ ./perf -vv
perf version 4.13.rc5.gc2f8af9
dwarf: [ on ] # HAVE_DWARF_SUPPORT
dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT
glibc: [ on ] # HAVE_GLIBC_SUPPORT
gtk2: [ on ] # HAVE_GTK2_SUPPORT
syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT
libbfd: [ on ] # HAVE_LIBBFD_SUPPORT
libelf: [ on ] # HAVE_LIBELF_SUPPORT
libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT
numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT
libperl: [ on ] # HAVE_LIBPERL_SUPPORT
libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT
libslang: [ on ] # HAVE_SLANG_SUPPORT
libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT
libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT
libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT
zlib: [ on ] # HAVE_ZLIB_SUPPORT
lzma: [ on ] # HAVE_LZMA_SUPPORT
get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT
bpf: [ on ] # HAVE_LIBBPF_SUPPORTThe line "syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT" is new created.
--- tools/perf/builtin-version.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/builtin-version.c +3 -0
@@ -60,7 +60,10 @@ static void library_status(void)STATUS (HAVE_DWARF_GETLOCATIONS_SUPPORT , dwarf_getlocations);STATUS (HAVE_GLIBC_SUPPORT , glibc);STATUS (HAVE_GTK2_SUPPORT , gtk2); +#ifndef HAVE_SYSCALL_TABLE_SUPPORT STATUS (HAVE_LIBAUDIT_SUPPORT , libaudit); +#endif +STATUS (HAVE_SYSCALL_TABLE_SUPPORT , syscall_table);STATUS (HAVE_LIBBFD_SUPPORT , libbfd);STATUS (HAVE_LIBELF_SUPPORT , libelf);STATUS (HAVE_LIBNUMA_SUPPORT , libnuma);
Arnaldo Carvalho de Melo
maintainerEm Mon, Apr 09, 2018 at 06:26:46PM +0800, Jin Yao escreveu:
Quoted 8 lines
1. Remove -DNO_LIBPERL and use -DHAVE_LIBPERL_SUPPORT in C code.
2. Remove -DNO_LIBPYTHON and use -DHAVE_LIBPYTHON_SUPPORT in C code.
3. Rename
HAVE_SYSCALL_TABLEtoHAVE_SYSCALL_TABLE_SUPPORT.4. Don't print "libaudit" line if
HAVE_SYSCALL_TABLE_SUPPORTis available and add a line forHAVE_SYSCALL_TABLE_SUPPORT.
Applied after adding the Suggested-by tags for the three patches,
Thanks,
- Arnaldo
Quoted 17 lines
Jin Yao (3):
perf script: UseHAVE_LIBXXX_SUPPORTto replaceNO_LIBXXX
perf: RenameHAVE_SYSCALL_TABLEtoHAVE_SYSCALL_TABLE_SUPPORTperf version: Print status forsyscall_tabletools/perf/Makefile.config | 2 +- tools/perf/builtin-help.c | 2 +- tools/perf/builtin-script.c | 4 ++-- tools/perf/builtin-version.c | 3 +++ tools/perf/perf.c | 4 ++-- tools/perf/util/generate-cmdlist.sh | 2 +- tools/perf/util/syscalltbl.c | 6 +++--- tools/perf/util/trace-event-scripting.c | 4 ++-- 8 files changed, 15 insertions(+), 12 deletions(-)Signature · 1 line
2.7.4