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.

perf build: Include libtraceevent headers directly indicated by pkg-config

Currently the libtraceevent's found by pkg-config, which give the
include path as:

[root@localhost tmp]# pkg-config --cflags libtraceevent
-I/usr/local/include/traceevent

So we should include the libtraceevent headers directly without
"traceevent/" prefix. Update all the users.

Fixes: 0f0e1f445690 ("perf build: Use pkg-config for feature check for libtrace{event,fs}")
Suggested-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/linux-perf-users/ZyF5_Hf1iL01kldE@google.com/
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Cc: leo.yan@arm.com
Cc: amadio@gentoo.org
Cc: linuxarm@huawei.com
Link: https://lore.kernel.org/r/20241105105649.45399-1-yangyicong@huawei.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

authored by

Yicong Yang and committed by
Namhyung Kim 35de42cd e8328bf3

+23 -23
+1 -1
tools/build/feature/test-libtraceevent.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - #include <traceevent/trace-seq.h> 2 + #include <trace-seq.h> 3 3 4 4 int main(void) 5 5 {
+1 -1
tools/perf/builtin-kmem.c
··· 36 36 #include <regex.h> 37 37 38 38 #include <linux/ctype.h> 39 - #include <traceevent/event-parse.h> 39 + #include <event-parse.h> 40 40 41 41 static int kmem_slab; 42 42 static int kmem_page;
+1 -1
tools/perf/builtin-kwork.c
··· 23 23 24 24 #include <subcmd/pager.h> 25 25 #include <subcmd/parse-options.h> 26 - #include <traceevent/event-parse.h> 26 + #include <event-parse.h> 27 27 28 28 #include <errno.h> 29 29 #include <inttypes.h>
+1 -1
tools/perf/builtin-report.c
··· 70 70 #include <linux/mman.h> 71 71 72 72 #ifdef HAVE_LIBTRACEEVENT 73 - #include <traceevent/event-parse.h> 73 + #include <event-parse.h> 74 74 #endif 75 75 76 76 struct report {
+1 -1
tools/perf/builtin-script.c
··· 67 67 68 68 #include <linux/ctype.h> 69 69 #ifdef HAVE_LIBTRACEEVENT 70 - #include <traceevent/event-parse.h> 70 + #include <event-parse.h> 71 71 #endif 72 72 73 73 static char const *script_name;
+1 -1
tools/perf/builtin-timechart.c
··· 38 38 #include "util/tracepoint.h" 39 39 #include "util/util.h" 40 40 #include <linux/err.h> 41 - #include <traceevent/event-parse.h> 41 + #include <event-parse.h> 42 42 43 43 #ifdef LACKS_OPEN_MEMSTREAM_PROTOTYPE 44 44 FILE *open_memstream(char **ptr, size_t *sizeloc);
+1 -1
tools/perf/builtin-trace.c
··· 88 88 #include <perf/mmap.h> 89 89 90 90 #ifdef HAVE_LIBTRACEEVENT 91 - #include <traceevent/event-parse.h> 91 + #include <event-parse.h> 92 92 #endif 93 93 94 94 #ifndef O_CLOEXEC
+1 -1
tools/perf/tests/evsel-tp-sched.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 #include <linux/err.h> 3 - #include <traceevent/event-parse.h> 3 + #include <event-parse.h> 4 4 #include "evsel.h" 5 5 #include "tests.h" 6 6 #include "debug.h"
+1 -1
tools/perf/util/data-convert-bt.c
··· 36 36 #include "util/sample.h" 37 37 38 38 #ifdef HAVE_LIBTRACEEVENT 39 - #include <traceevent/event-parse.h> 39 + #include <event-parse.h> 40 40 #endif 41 41 42 42 #define pr_N(n, fmt, ...) \
+1 -1
tools/perf/util/data-convert-json.c
··· 28 28 #include "util/tool.h" 29 29 30 30 #ifdef HAVE_LIBTRACEEVENT 31 - #include <traceevent/event-parse.h> 31 + #include <event-parse.h> 32 32 #endif 33 33 34 34 struct convert_json {
+1 -1
tools/perf/util/debug.c
··· 27 27 #include <linux/ctype.h> 28 28 29 29 #ifdef HAVE_LIBTRACEEVENT 30 - #include <traceevent/event-parse.h> 30 + #include <event-parse.h> 31 31 #else 32 32 #define LIBTRACEEVENT_VERSION 0 33 33 #endif
+1 -1
tools/perf/util/evsel.c
··· 70 70 #include <linux/ctype.h> 71 71 72 72 #ifdef HAVE_LIBTRACEEVENT 73 - #include <traceevent/event-parse.h> 73 + #include <event-parse.h> 74 74 #endif 75 75 76 76 struct perf_missing_features perf_missing_features;
+1 -1
tools/perf/util/evsel_fprintf.c
··· 14 14 #include "dso.h" 15 15 16 16 #ifdef HAVE_LIBTRACEEVENT 17 - #include <traceevent/event-parse.h> 17 + #include <event-parse.h> 18 18 #endif 19 19 20 20 static int comma_fprintf(FILE *fp, bool *first, const char *fmt, ...)
+1 -1
tools/perf/util/header.c
··· 58 58 #include <internal/lib.h> 59 59 60 60 #ifdef HAVE_LIBTRACEEVENT 61 - #include <traceevent/event-parse.h> 61 + #include <event-parse.h> 62 62 #endif 63 63 64 64 /*
+1 -1
tools/perf/util/python.c
··· 6 6 #include <linux/err.h> 7 7 #include <perf/cpumap.h> 8 8 #ifdef HAVE_LIBTRACEEVENT 9 - #include <traceevent/event-parse.h> 9 + #include <event-parse.h> 10 10 #endif 11 11 #include <perf/mmap.h> 12 12 #include "evlist.h"
+1 -1
tools/perf/util/scripting-engines/trace-event-perl.c
··· 27 27 #include <errno.h> 28 28 #include <linux/bitmap.h> 29 29 #include <linux/time64.h> 30 - #include <traceevent/event-parse.h> 30 + #include <event-parse.h> 31 31 32 32 #include <stdbool.h> 33 33 /* perl needs the following define, right after including stdbool.h */
+1 -1
tools/perf/util/scripting-engines/trace-event-python.c
··· 31 31 #include <linux/compiler.h> 32 32 #include <linux/time64.h> 33 33 #ifdef HAVE_LIBTRACEEVENT 34 - #include <traceevent/event-parse.h> 34 + #include <event-parse.h> 35 35 #endif 36 36 37 37 #include "../build-id.h"
+1 -1
tools/perf/util/sort.c
··· 35 35 #include <linux/string.h> 36 36 37 37 #ifdef HAVE_LIBTRACEEVENT 38 - #include <traceevent/event-parse.h> 38 + #include <event-parse.h> 39 39 #endif 40 40 41 41 regex_t parent_regex;
+1 -1
tools/perf/util/trace-event-parse.c
··· 12 12 13 13 #include <linux/ctype.h> 14 14 #include <linux/kernel.h> 15 - #include <traceevent/event-parse.h> 15 + #include <event-parse.h> 16 16 17 17 static int get_common_field(struct scripting_context *context, 18 18 int *offset, int *size, const char *type)
+1 -1
tools/perf/util/trace-event-read.c
··· 11 11 #include <sys/stat.h> 12 12 #include <sys/wait.h> 13 13 #include <sys/mman.h> 14 - #include <traceevent/event-parse.h> 14 + #include <event-parse.h> 15 15 #include <fcntl.h> 16 16 #include <unistd.h> 17 17 #include <errno.h>
+1 -1
tools/perf/util/trace-event-scripting.c
··· 10 10 #include <string.h> 11 11 #include <errno.h> 12 12 #ifdef HAVE_LIBTRACEEVENT 13 - #include <traceevent/event-parse.h> 13 + #include <event-parse.h> 14 14 #endif 15 15 16 16 #include "debug.h"
+1 -1
tools/perf/util/trace-event.c
··· 8 8 #include <fcntl.h> 9 9 #include <linux/kernel.h> 10 10 #include <linux/err.h> 11 - #include <traceevent/event-parse.h> 11 + #include <event-parse.h> 12 12 #include <api/fs/tracing_path.h> 13 13 #include <api/fs/fs.h> 14 14 #include "trace-event.h"
+1 -1
tools/perf/util/trace-event.h
··· 147 147 int perf_sample__sprintf_flags(u32 flags, char *str, size_t sz); 148 148 149 149 #if defined(LIBTRACEEVENT_VERSION) && LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0) 150 - #include <traceevent/event-parse.h> 150 + #include <event-parse.h> 151 151 152 152 static inline bool tep_field_is_relative(unsigned long flags) 153 153 {