mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-29 17:25:38 +00:00
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: 0f0e1f4456
("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>
This commit is contained in:
parent
e8328bf3cd
commit
35de42cdfb
@ -1,5 +1,5 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
#include <traceevent/trace-seq.h>
|
||||
#include <trace-seq.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include <regex.h>
|
||||
|
||||
#include <linux/ctype.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
|
||||
static int kmem_slab;
|
||||
static int kmem_page;
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#include <subcmd/pager.h>
|
||||
#include <subcmd/parse-options.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <inttypes.h>
|
||||
|
@ -70,7 +70,7 @@
|
||||
#include <linux/mman.h>
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
struct report {
|
||||
|
@ -67,7 +67,7 @@
|
||||
|
||||
#include <linux/ctype.h>
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
static char const *script_name;
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include "util/tracepoint.h"
|
||||
#include "util/util.h"
|
||||
#include <linux/err.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
|
||||
#ifdef LACKS_OPEN_MEMSTREAM_PROTOTYPE
|
||||
FILE *open_memstream(char **ptr, size_t *sizeloc);
|
||||
|
@ -88,7 +88,7 @@
|
||||
#include <perf/mmap.h>
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
#ifndef O_CLOEXEC
|
||||
|
@ -1,6 +1,6 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
#include <linux/err.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#include "evsel.h"
|
||||
#include "tests.h"
|
||||
#include "debug.h"
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include "util/sample.h"
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
#define pr_N(n, fmt, ...) \
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include "util/tool.h"
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
struct convert_json {
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <linux/ctype.h>
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#else
|
||||
#define LIBTRACEEVENT_VERSION 0
|
||||
#endif
|
||||
|
@ -70,7 +70,7 @@
|
||||
#include <linux/ctype.h>
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
struct perf_missing_features perf_missing_features;
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "dso.h"
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
static int comma_fprintf(FILE *fp, bool *first, const char *fmt, ...)
|
||||
|
@ -58,7 +58,7 @@
|
||||
#include <internal/lib.h>
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include <linux/err.h>
|
||||
#include <perf/cpumap.h>
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
#include <perf/mmap.h>
|
||||
#include "evlist.h"
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <errno.h>
|
||||
#include <linux/bitmap.h>
|
||||
#include <linux/time64.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
|
||||
#include <stdbool.h>
|
||||
/* perl needs the following define, right after including stdbool.h */
|
||||
|
@ -31,7 +31,7 @@
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/time64.h>
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
#include "../build-id.h"
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <linux/string.h>
|
||||
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
regex_t parent_regex;
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
|
||||
static int get_common_field(struct scripting_context *context,
|
||||
int *offset, int *size, const char *type)
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/mman.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#ifdef HAVE_LIBTRACEEVENT
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#endif
|
||||
|
||||
#include "debug.h"
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/err.h>
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
#include <api/fs/tracing_path.h>
|
||||
#include <api/fs/fs.h>
|
||||
#include "trace-event.h"
|
||||
|
@ -147,7 +147,7 @@ int common_lock_depth(struct scripting_context *context);
|
||||
int perf_sample__sprintf_flags(u32 flags, char *str, size_t sz);
|
||||
|
||||
#if defined(LIBTRACEEVENT_VERSION) && LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)
|
||||
#include <traceevent/event-parse.h>
|
||||
#include <event-parse.h>
|
||||
|
||||
static inline bool tep_field_is_relative(unsigned long flags)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user