perf tools: Use default include path notation for libtraceevent headers

PATCH New Robert Richter 2 participants 2 messages Jun 11, 2013 – Jul 19, 2013 perf events

lore

Share & tools

lore

Robert Richter

author

2013-06-11 15:29 UTC #0 lore raw

PATCH 1/1 perf tools: Use default include path notation for libtraceevent headers

From: Robert Richter <[email protected]>

Header files of libtraceevent or no longer local headers. Thus, use default path notation for them. Also removing extra traceevent include path and instead handle this similar to liblk.

Signed-off-by Robert Richter <[email protected]>

---
 tools/perf/Makefile               | 2 +-
 tools/perf/builtin-trace.c        | 2 +-
 tools/perf/config/Makefile        | 5 +++--
 tools/perf/tests/evsel-tp-sched.c | 2 +-
 tools/perf/util/evsel.c           | 8 ++++----
 tools/perf/util/session.c         | 2 +-
 tools/perf/util/trace-event.h     | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

tools/perf/Makefile +1 -1

index 641fccd..5b7c6db 100644
@@ -281,7 +281,7 @@ LIB_H += util/cpumap.h
 LIB_H += util/top.h
 LIB_H += $(ARCH_INCLUDE)
 LIB_H += util/cgroup.h
-LIB_H += $(TRACE_EVENT_DIR)event-parse.h
+LIB_H += $(LIB_INCLUDE)traceevent/event-parse.h
 LIB_H += util/target.h
 LIB_H += util/rblist.h
 LIB_H += util/intlist.h

tools/perf/builtin-trace.c +1 -1

index ab3ed4a..87fc7d0 100644
@@ -1,3 +1,4 @@
+#include <traceevent/event-parse.h>
 #include "builtin.h"
 #include "util/color.h"
 #include "util/evlist.h"

@@ -5,7 +6,6 @@
 #include "util/thread.h"
 #include "util/parse-options.h"
 #include "util/thread_map.h"
-#include "event-parse.h"
 
 #include <libaudit.h>
 #include <stdlib.h>

tools/perf/config/Makefile +3 -2

index f446895..d071077 100644
@@ -46,6 +46,8 @@ ifneq ($(obj-perf),)
 obj-perf := $(abspath $(obj-perf))/
 endif
 
+LIB_INCLUDE := $(srctree)/tools/lib/
+
 # include ARCH specific config
 -include $(src-perf)/arch/$(ARCH)/Makefile

@@ -121,8 +123,7 @@ endif
 
 CFLAGS += -I$(src-perf)/util
 CFLAGS += -I$(src-perf)
-CFLAGS += -I$(TRACE_EVENT_DIR)
-CFLAGS += -I$(srctree)/tools/lib/
+CFLAGS += -I$(LIB_INCLUDE)
 
 CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

tools/perf/tests/evsel-tp-sched.c +1 -1

index a5d2fcc..f79e7d0 100644
@@ -1,6 +1,6 @@
+#include <traceevent/event-parse.h>
 #include "evsel.h"
 #include "tests.h"
-#include "event-parse.h"
 
 static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
 				  int size, bool should_be_signed)

tools/perf/util/evsel.c +4 -4

index 63b6f8c..dea0684 100644
@@ -9,17 +9,17 @@
 
 #include <byteswap.h>
 #include <linux/bitops.h>
-#include "asm/bug.h"
 #include <lk/debugfs.h>
-#include "event-parse.h"
+#include <traceevent/event-parse.h>
+#include <linux/hw_breakpoint.h>
+#include <linux/perf_event.h>
+#include "asm/bug.h"
 #include "evsel.h"
 #include "evlist.h"
 #include "util.h"
 #include "cpumap.h"
 #include "thread_map.h"
 #include "target.h"
-#include <linux/hw_breakpoint.h>
-#include <linux/perf_event.h>
 #include "perf_regs.h"
 
 static struct {

tools/perf/util/session.c +1 -1

index cf1fe01..ad47fb9 100644
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <traceevent/event-parse.h>
 
 #include <byteswap.h>
 #include <unistd.h>

@@ -12,7 +13,6 @@
 #include "sort.h"
 #include "util.h"
 #include "cpumap.h"
-#include "event-parse.h"
 #include "perf_regs.h"
 #include "vdso.h"

tools/perf/util/trace-event.h +1 -1

index 1978c39..11eb7fd 100644
@@ -1,8 +1,8 @@
 #ifndef _PERF_UTIL_TRACE_EVENT_H
 #define _PERF_UTIL_TRACE_EVENT_H
 
+#include <traceevent/event-parse.h>
 #include "parse-events.h"
-#include "event-parse.h"
 #include "session.h"
 
 struct machine;

Signature · 1 line

1.8.1.1

tip-bot for Robert Richter

merge bot

2013-07-19 07:43 UTC #1 lore raw

perf tools: Use default include path notation for libtraceevent headers

Commit-ID:  4e319027a7aee58ce8d409f5597b418f08307841
Gitweb:     http://git.kernel.org/tip/4e319027a7aee58ce8d409f5597b418f08307841
Author:     Robert Richter <[email protected]>
AuthorDate: Tue, 11 Jun 2013 17:29:18 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 12 Jul 2013 13:45:54 -0300

perf tools: Use default include path notation for libtraceevent headers

Header files of libtraceevent or no longer local headers. Thus, use default path notation for them. Also removing extra traceevent include path and instead handle this similar to liblk.

Signed-off-by Robert Richter <[email protected]>

Cc Ingo Molnar <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Robert Richter <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/Makefile               | 2 +-
 tools/perf/builtin-trace.c        | 2 +-
 tools/perf/config/Makefile        | 5 +++--
 tools/perf/tests/evsel-tp-sched.c | 2 +-
 tools/perf/util/evsel.c           | 8 ++++----
 tools/perf/util/session.c         | 2 +-
 tools/perf/util/trace-event.h     | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)

tools/perf/Makefile +1 -1

index 641fccd..5b7c6db 100644
@@ -281,7 +281,7 @@ LIB_H += util/cpumap.h
 LIB_H += util/top.h
 LIB_H += $(ARCH_INCLUDE)
 LIB_H += util/cgroup.h
-LIB_H += $(TRACE_EVENT_DIR)event-parse.h
+LIB_H += $(LIB_INCLUDE)traceevent/event-parse.h
 LIB_H += util/target.h
 LIB_H += util/rblist.h
 LIB_H += util/intlist.h

tools/perf/builtin-trace.c +1 -1

index ab3ed4a..87fc7d0 100644
@@ -1,3 +1,4 @@
+#include <traceevent/event-parse.h>
 #include "builtin.h"
 #include "util/color.h"
 #include "util/evlist.h"

@@ -5,7 +6,6 @@
 #include "util/thread.h"
 #include "util/parse-options.h"
 #include "util/thread_map.h"
-#include "event-parse.h"
 
 #include <libaudit.h>
 #include <stdlib.h>

tools/perf/config/Makefile +3 -2

index b5d9238..214e17e 100644
@@ -46,6 +46,8 @@ ifneq ($(obj-perf),)
 obj-perf := $(abspath $(obj-perf))/
 endif
 
+LIB_INCLUDE := $(srctree)/tools/lib/
+
 # include ARCH specific config
 -include $(src-perf)/arch/$(ARCH)/Makefile

@@ -121,8 +123,7 @@ endif
 
 CFLAGS += -I$(src-perf)/util
 CFLAGS += -I$(src-perf)
-CFLAGS += -I$(TRACE_EVENT_DIR)
-CFLAGS += -I$(srctree)/tools/lib/
+CFLAGS += -I$(LIB_INCLUDE)
 
 CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

tools/perf/tests/evsel-tp-sched.c +1 -1

index a5d2fcc..f79e7d0 100644
@@ -1,6 +1,6 @@
+#include <traceevent/event-parse.h>
 #include "evsel.h"
 #include "tests.h"
-#include "event-parse.h"
 
 static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
 				  int size, bool should_be_signed)

tools/perf/util/evsel.c +4 -4

index c9c7494..a635461 100644
@@ -9,17 +9,17 @@
 
 #include <byteswap.h>
 #include <linux/bitops.h>
-#include "asm/bug.h"
 #include <lk/debugfs.h>
-#include "event-parse.h"
+#include <traceevent/event-parse.h>
+#include <linux/hw_breakpoint.h>
+#include <linux/perf_event.h>
+#include "asm/bug.h"
 #include "evsel.h"
 #include "evlist.h"
 #include "util.h"
 #include "cpumap.h"
 #include "thread_map.h"
 #include "target.h"
-#include <linux/hw_breakpoint.h>
-#include <linux/perf_event.h>
 #include "perf_regs.h"
 
 static struct {

tools/perf/util/session.c +1 -1

index cf1fe01..ad47fb9 100644
@@ -1,4 +1,5 @@
 #include <linux/kernel.h>
+#include <traceevent/event-parse.h>
 
 #include <byteswap.h>
 #include <unistd.h>

@@ -12,7 +13,6 @@
 #include "sort.h"
 #include "util.h"
 #include "cpumap.h"
-#include "event-parse.h"
 #include "perf_regs.h"
 #include "vdso.h"

tools/perf/util/trace-event.h +1 -1

index 1978c39..11eb7fd 100644
@@ -1,8 +1,8 @@
 #ifndef _PERF_UTIL_TRACE_EVENT_H
 #define _PERF_UTIL_TRACE_EVENT_H
 
+#include <traceevent/event-parse.h>
 #include "parse-events.h"
-#include "event-parse.h"
 #include "session.h"
 
 struct machine;