tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'perf-tools-fixes-for-v5.16-2022-01-09' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

- Revert "libtraceevent: Increase libtraceevent logging when verbose",
breaks the build with libtraceevent-1.3.0, i.e. when building with
'LIBTRACEEVENT_DYNAMIC=1'.

- Avoid early exit in 'perf trace' due to running SIGCHLD handler
before it makes sense to. It can happen when using a BPF source code
event that have to be first built into an object file.

* tag 'perf-tools-fixes-for-v5.16-2022-01-09' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
Revert "libtraceevent: Increase libtraceevent logging when verbose"
perf trace: Avoid early exit due to running SIGCHLD handler before it makes sense to

Linus Torvalds 9a12a5aa df5bc0aa

+1 -20
+1 -1
tools/perf/builtin-trace.c
··· 3925 3925 bool draining = false; 3926 3926 3927 3927 trace->live = true; 3928 + signal(SIGCHLD, sig_handler); 3928 3929 3929 3930 if (!trace->raw_augmented_syscalls) { 3930 3931 if (trace->trace_syscalls && trace__add_syscall_newtp(trace)) ··· 4874 4873 4875 4874 signal(SIGSEGV, sighandler_dump_stack); 4876 4875 signal(SIGFPE, sighandler_dump_stack); 4877 - signal(SIGCHLD, sig_handler); 4878 4876 signal(SIGINT, sig_handler); 4879 4877 4880 4878 trace.evlist = evlist__new();
-19
tools/perf/util/debug.c
··· 24 24 #include "util/parse-sublevel-options.h" 25 25 26 26 #include <linux/ctype.h> 27 - #include <traceevent/event-parse.h> 28 - 29 - #define MAKE_LIBTRACEEVENT_VERSION(a, b, c) ((a)*255*255+(b)*255+(c)) 30 - #ifndef LIBTRACEEVENT_VERSION 31 - /* 32 - * If LIBTRACEEVENT_VERSION wasn't computed then set to version 1.1.0 that ships 33 - * with the Linux kernel tools. 34 - */ 35 - #define LIBTRACEEVENT_VERSION MAKE_LIBTRACEEVENT_VERSION(1, 1, 0) 36 - #endif 37 27 38 28 int verbose; 39 29 int debug_peo_args; ··· 227 237 228 238 /* Allow only verbose value in range (0, 10), otherwise set 0. */ 229 239 verbose = (verbose < 0) || (verbose > 10) ? 0 : verbose; 230 - 231 - #if MAKE_LIBTRACEEVENT_VERSION(1, 3, 0) <= LIBTRACEEVENT_VERSION 232 - if (verbose == 1) 233 - tep_set_loglevel(TEP_LOG_INFO); 234 - else if (verbose == 2) 235 - tep_set_loglevel(TEP_LOG_DEBUG); 236 - else if (verbose >= 3) 237 - tep_set_loglevel(TEP_LOG_ALL); 238 - #endif 239 240 240 241 return 0; 241 242 }