* [PATCH 1/3] perf tools: Fix build breakage
2010-10-04 18:54 [GIT PULL 0/3] perf/urgent fixes Arnaldo Carvalho de Melo
@ 2010-10-04 18:54 ` Arnaldo Carvalho de Melo
2010-10-04 18:54 ` [PATCH 2/3] perf ui hist browser: Fix segfault on 'a' for annotate Arnaldo Carvalho de Melo
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-04 18:54 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Kusanagi Kouichi, Bernd Petrovitsch,
Arnaldo Carvalho de Melo
From: Kusanagi Kouichi <slash@ac.auone-net.jp>
The patch ecafda6 introduced a problem where all object files would be
always rebuilt, fix it by using:
http://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Bernd Petrovitsch <bernd@sysprog.at>
Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 4f1fa77..1950e19 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -1017,7 +1017,7 @@ builtin-revert.o wt-status.o: wt-status.h
# we compile into subdirectories. if the target directory is not the source directory, they might not exists. So
# we depend the various files onto their directories.
DIRECTORY_DEPS = $(LIB_OBJS) $(BUILTIN_OBJS) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h
-$(DIRECTORY_DEPS): $(sort $(dir $(DIRECTORY_DEPS)))
+$(DIRECTORY_DEPS): | $(sort $(dir $(DIRECTORY_DEPS)))
# In the second step, we make a rule to actually create these directories
$(sort $(dir $(DIRECTORY_DEPS))):
$(QUIET_MKDIR)$(MKDIR) -p $@ 2>/dev/null
--
1.6.2.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] perf ui hist browser: Fix segfault on 'a' for annotate
2010-10-04 18:54 [GIT PULL 0/3] perf/urgent fixes Arnaldo Carvalho de Melo
2010-10-04 18:54 ` [PATCH 1/3] perf tools: Fix build breakage Arnaldo Carvalho de Melo
@ 2010-10-04 18:54 ` Arnaldo Carvalho de Melo
2010-10-04 18:54 ` [PATCH 3/3] perf trace scripting: Fix extern struct definitions Arnaldo Carvalho de Melo
2010-10-05 6:18 ` [GIT PULL 0/3] perf/urgent fixes Ingo Molnar
3 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-04 18:54 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-kernel, Frederik Deweerdt, Arnaldo Carvalho de Melo
From: Frederik Deweerdt <frederik.deweerdt@xprog.eu>
There a typo in util/ui/browsers/hists.c that leads to a segfault when you
press the 'a' key on a non-resolved symbol (plain hex address).
LKML-Reference: <20100923201901.GE31726@gambetta>
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xprog.eu>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/ui/browsers/hists.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index dafdf67..6866aa4 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -773,7 +773,7 @@ int hists__browse(struct hists *self, const char *helpline, const char *ev_name)
switch (key) {
case 'a':
- if (browser->selection->map == NULL &&
+ if (browser->selection->map == NULL ||
browser->selection->map->dso->annotate_warned)
continue;
goto do_annotate;
--
1.6.2.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] perf trace scripting: Fix extern struct definitions
2010-10-04 18:54 [GIT PULL 0/3] perf/urgent fixes Arnaldo Carvalho de Melo
2010-10-04 18:54 ` [PATCH 1/3] perf tools: Fix build breakage Arnaldo Carvalho de Melo
2010-10-04 18:54 ` [PATCH 2/3] perf ui hist browser: Fix segfault on 'a' for annotate Arnaldo Carvalho de Melo
@ 2010-10-04 18:54 ` Arnaldo Carvalho de Melo
2010-10-05 6:18 ` [GIT PULL 0/3] perf/urgent fixes Ingo Molnar
3 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-04 18:54 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Stephane Eranian, David S. Miller,
Frederic Weisbecker, Ingo Molnar, Paul Mackerras, Peter Zijlstra,
Robert Richter, Arnaldo Carvalho de Melo
From: Stephane Eranian <eranian@google.com>
Both python_scripting_ops and perl_scripting_ops have two global definitions.
One in trace-event-scripting.c and one in their respective scripting-engine
modules.
The issue is that depending on the linker order one definition or the other
is chosen. One is uninitialized (bss), while the other is initialized. If
the uninitialized version is chosen, then perf does not function properly.
This patch fixes this by adding the extern prefix to the definitions in
trace-event-scripting.c.
Cc: David S. Miller <davem@davemloft.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <robert.richter@amd.com>
LKML-Reference: <4c97e41a.078fd80a.7a8b.3cc9@mx.google.com>
Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/trace-event-scripting.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index 7ea983a..f7af2fc 100644
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -97,7 +97,7 @@ void setup_python_scripting(void)
register_python_scripting(&python_scripting_unsupported_ops);
}
#else
-struct scripting_ops python_scripting_ops;
+extern struct scripting_ops python_scripting_ops;
void setup_python_scripting(void)
{
@@ -158,7 +158,7 @@ void setup_perl_scripting(void)
register_perl_scripting(&perl_scripting_unsupported_ops);
}
#else
-struct scripting_ops perl_scripting_ops;
+extern struct scripting_ops perl_scripting_ops;
void setup_perl_scripting(void)
{
--
1.6.2.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [GIT PULL 0/3] perf/urgent fixes
2010-10-04 18:54 [GIT PULL 0/3] perf/urgent fixes Arnaldo Carvalho de Melo
` (2 preceding siblings ...)
2010-10-04 18:54 ` [PATCH 3/3] perf trace scripting: Fix extern struct definitions Arnaldo Carvalho de Melo
@ 2010-10-05 6:18 ` Ingo Molnar
3 siblings, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2010-10-05 6:18 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Bernd Petrovitsch, David S . Miller,
Frederic Weisbecker, Frederik Deweerdt, Kusanagi Kouichi,
Paul Mackerras, Peter Zijlstra, Robert Richter, Stephane Eranian
* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:
> Hi Ingo,
>
> Please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
>
> Regards,
>
> - Arnaldo
>
> Frederik Deweerdt (1):
> perf ui hist browser: Fix segfault on 'a' for annotate
>
> Kusanagi Kouichi (1):
> perf tools: Fix build breakage
>
> Stephane Eranian (1):
> perf trace scripting: Fix extern struct definitions
>
> tools/perf/Makefile | 2 +-
> tools/perf/util/trace-event-scripting.c | 4 ++--
> tools/perf/util/ui/browsers/hists.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread