2012-05-22 09:06:00

by Namhyung Kim

[permalink] [raw]
Subject: [PATCH 1/2] perf tools: Rename libparsevent to libtraceevent in Makefile

Change some variable names according to new library name.

Signed-off-by: Namhyung Kim <[email protected]>
---
tools/perf/Makefile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index fa37cd53e9b9..022845e51937 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -149,7 +149,7 @@ endif

### --- END CONFIGURATION SECTION ---

-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(EVENT_PARSE_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
BASIC_LDFLAGS =

# Guard against environment variables
@@ -178,16 +178,16 @@ $(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)

SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))

-EVENT_PARSE_DIR = ../lib/traceevent/
+TRACE_EVENT_DIR = ../lib/traceevent/

ifeq ("$(origin O)", "command line")
- EP_PATH=$(OUTPUT)/
+ TE_PATH=$(OUTPUT)/
else
- EP_PATH=$(EVENT_PARSE_DIR)/
+ TE_PATH=$(TRACE_EVENT_DIR)/
endif

-LIBPARSEVENT = $(EP_PATH)libtraceevent.a
-EP_LIB := -L$(EP_PATH) -ltraceevent
+LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
+TE_LIB := -L$(TE_PATH) -ltraceevent

#
# Single 'perf' binary right now:
@@ -311,7 +311,7 @@ LIB_H += util/cpumap.h
LIB_H += util/top.h
LIB_H += $(ARCH_INCLUDE)
LIB_H += util/cgroup.h
-LIB_H += $(EVENT_PARSE_DIR)event-parse.h
+LIB_H += $(TRACE_EVENT_DIR)event-parse.h
LIB_H += util/target.h

LIB_OBJS += $(OUTPUT)util/abspath.o
@@ -410,7 +410,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o
BUILTIN_OBJS += $(OUTPUT)builtin-test.o
BUILTIN_OBJS += $(OUTPUT)builtin-inject.o

-PERFLIBS = $(LIB_FILE) $(LIBPARSEVENT)
+PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT)

# Files needed for the python binding, perf.so
# pyrf is just an internal name needed for all those wrappers.
@@ -819,9 +819,9 @@ $(sort $(dir $(DIRECTORY_DEPS))):
$(LIB_FILE): $(LIB_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)

-# libparsevent.a
-$(LIBPARSEVENT):
- make -C $(EVENT_PARSE_DIR) $(COMMAND_O) libtraceevent.a
+# libtraceevent.a
+$(LIBTRACEEVENT):
+ $(MAKE) -C $(TRACE_EVENT_DIR) $(COMMAND_O) libtraceevent.a

help:
@echo 'Perf make targets:'
--
1.7.10.1


2012-05-22 09:06:03

by Namhyung Kim

[permalink] [raw]
Subject: [PATCH 2/2] perf tools: Always try to build libtraceevent

Although perf depends on the libtraceevent, it cannot know
when it needs to be rebuilt. So just try to rebuild it
always in order to make sure we use the latest version.

While at it, silence annoying directory change messages.

Signed-off-by: Namhyung Kim <[email protected]>
---
tools/perf/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 022845e51937..a3d2324b9cd7 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -821,7 +821,7 @@ $(LIB_FILE): $(LIB_OBJS)

# libtraceevent.a
$(LIBTRACEEVENT):
- $(MAKE) -C $(TRACE_EVENT_DIR) $(COMMAND_O) libtraceevent.a
+ $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) $(COMMAND_O) libtraceevent.a

help:
@echo 'Perf make targets:'
@@ -969,6 +969,6 @@ clean:
$(RM) $(OUTPUT)util/*-{bison,flex}*
$(python-clean)

-.PHONY: all install clean strip
+.PHONY: all install clean strip $(LIBTRACEEVENT)
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope .FORCE-PERF-CFLAGS
--
1.7.10.1

2012-05-22 15:36:57

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH 2/2] perf tools: Always try to build libtraceevent

Em Tue, May 22, 2012 at 06:03:54PM +0900, Namhyung Kim escreveu:
> While at it, silence annoying directory change messages.

Applied, have you seen these?

make[1]: Entering directory `/home/git/linux/tools/lib/traceevent'
make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
make[2]: `libtraceevent.a' is up to date.

2012-05-23 01:16:07

by Namhyung Kim

[permalink] [raw]
Subject: Re: [PATCH 2/2] perf tools: Always try to build libtraceevent

Hi,

On Tue, 22 May 2012 12:36:48 -0300, Arnaldo Carvalho de Melo wrote:
> Em Tue, May 22, 2012 at 06:03:54PM +0900, Namhyung Kim escreveu:
>> While at it, silence annoying directory change messages.
>
> Applied, have you seen these?
>
> make[1]: Entering directory `/home/git/linux/tools/lib/traceevent'
> make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
> make[2]: `libtraceevent.a' is up to date.

Yes, but I didn't know how to handle them properly. And the first line
looks like a bug of QUIET_SUBDIR stuff. Did you build it out of the
kernel tree?

Thanks,
Namhyung

2012-05-23 01:43:49

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH 2/2] perf tools: Always try to build libtraceevent

Em Wed, May 23, 2012 at 10:13:55AM +0900, Namhyung Kim escreveu:
> Hi,
>
> On Tue, 22 May 2012 12:36:48 -0300, Arnaldo Carvalho de Melo wrote:
> > Em Tue, May 22, 2012 at 06:03:54PM +0900, Namhyung Kim escreveu:
> >> While at it, silence annoying directory change messages.
> >
> > Applied, have you seen these?
> >
> > make[1]: Entering directory `/home/git/linux/tools/lib/traceevent'
> > make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
> > make[2]: `libtraceevent.a' is up to date.
>
> Yes, but I didn't know how to handle them properly. And the first line
> looks like a bug of QUIET_SUBDIR stuff. Did you build it out of the
> kernel tree?

I always use:

[acme@sandy linux]$ make -j8 -C tools/perf/ O=/home/git/build/perf install

- Arnaldo

2012-05-23 15:23:33

by Namhyung Kim

[permalink] [raw]
Subject: [tip:perf/core] perf tools: Rename libparsevent to libtraceevent in Makefile

Commit-ID: 59f3bea53bfe2f395d548906fa39d01df620f0ac
Gitweb: http://git.kernel.org/tip/59f3bea53bfe2f395d548906fa39d01df620f0ac
Author: Namhyung Kim <[email protected]>
AuthorDate: Tue, 22 May 2012 18:03:53 +0900
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 22 May 2012 12:34:52 -0300

perf tools: Rename libparsevent to libtraceevent in Makefile

Change some variable names according to new library name.

Signed-off-by: Namhyung Kim <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/Makefile | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index b246236..ef75a55 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -155,7 +155,7 @@ endif

### --- END CONFIGURATION SECTION ---

-BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(EVENT_PARSE_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)/util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
BASIC_LDFLAGS =

# Guard against environment variables
@@ -184,16 +184,16 @@ $(OUTPUT)python/perf.so: $(PYRF_OBJS) $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)

SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))

-EVENT_PARSE_DIR = ../lib/traceevent/
+TRACE_EVENT_DIR = ../lib/traceevent/

ifeq ("$(origin O)", "command line")
- EP_PATH=$(OUTPUT)/
+ TE_PATH=$(OUTPUT)/
else
- EP_PATH=$(EVENT_PARSE_DIR)/
+ TE_PATH=$(TRACE_EVENT_DIR)/
endif

-LIBPARSEVENT = $(EP_PATH)libtraceevent.a
-EP_LIB := -L$(EP_PATH) -ltraceevent
+LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
+TE_LIB := -L$(TE_PATH) -ltraceevent

#
# Single 'perf' binary right now:
@@ -317,7 +317,7 @@ LIB_H += util/cpumap.h
LIB_H += util/top.h
LIB_H += $(ARCH_INCLUDE)
LIB_H += util/cgroup.h
-LIB_H += $(EVENT_PARSE_DIR)event-parse.h
+LIB_H += $(TRACE_EVENT_DIR)event-parse.h
LIB_H += util/target.h

LIB_OBJS += $(OUTPUT)util/abspath.o
@@ -417,7 +417,7 @@ BUILTIN_OBJS += $(OUTPUT)builtin-kvm.o
BUILTIN_OBJS += $(OUTPUT)builtin-test.o
BUILTIN_OBJS += $(OUTPUT)builtin-inject.o

-PERFLIBS = $(LIB_FILE) $(LIBPARSEVENT)
+PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT)

# Files needed for the python binding, perf.so
# pyrf is just an internal name needed for all those wrappers.
@@ -826,9 +826,9 @@ $(sort $(dir $(DIRECTORY_DEPS))):
$(LIB_FILE): $(LIB_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)

-# libparsevent.a
-$(LIBPARSEVENT):
- make -C $(EVENT_PARSE_DIR) $(COMMAND_O) libtraceevent.a
+# libtraceevent.a
+$(LIBTRACEEVENT):
+ $(MAKE) -C $(TRACE_EVENT_DIR) $(COMMAND_O) libtraceevent.a

help:
@echo 'Perf make targets:'

2012-05-23 15:24:19

by Namhyung Kim

[permalink] [raw]
Subject: [tip:perf/core] perf tools: Always try to build libtraceevent

Commit-ID: e33387fc2748ac78fd577dee2c914fc3ea0ba0cd
Gitweb: http://git.kernel.org/tip/e33387fc2748ac78fd577dee2c914fc3ea0ba0cd
Author: Namhyung Kim <[email protected]>
AuthorDate: Tue, 22 May 2012 18:03:54 +0900
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 22 May 2012 12:35:29 -0300

perf tools: Always try to build libtraceevent

Although perf depends on the libtraceevent, it cannot know when it needs
to be rebuilt. So just try to rebuild it always in order to make sure we
use the latest version.

While at it, silence annoying directory change messages.

Signed-off-by: Namhyung Kim <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index ef75a55..1d3d513 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -828,7 +828,7 @@ $(LIB_FILE): $(LIB_OBJS)

# libtraceevent.a
$(LIBTRACEEVENT):
- $(MAKE) -C $(TRACE_EVENT_DIR) $(COMMAND_O) libtraceevent.a
+ $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) $(COMMAND_O) libtraceevent.a

help:
@echo 'Perf make targets:'
@@ -976,6 +976,6 @@ clean:
$(RM) $(OUTPUT)util/*-{bison,flex}*
$(python-clean)

-.PHONY: all install clean strip
+.PHONY: all install clean strip $(LIBTRACEEVENT)
.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope .FORCE-PERF-CFLAGS