* [PATCH 1/5] perf tools: Remove direct slang.h include
2010-10-23 20:28 [GIT PULL 0/5] perf/core improvements and fixes Arnaldo Carvalho de Melo
@ 2010-10-23 20:28 ` Arnaldo Carvalho de Melo
2010-10-23 20:28 ` [PATCH 2/5] perf tools: Document event modifiers Arnaldo Carvalho de Melo
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-23 20:28 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo,
Frédéric Weisbecker, Mike Galbraith, Peter Zijlstra,
Paul Mackerras, Stephane Eranian
From: Arnaldo Carvalho de Melo <acme@redhat.com>
We wrap it in libslang.h because we need to deal with older slang release
where HAVE_LONG_LONG is referenced as:
So we need to define it.
Noticed when rebuilding the perf tools on a RHEL5 machine.
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/ui/browser.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/ui/browser.c b/tools/perf/util/ui/browser.c
index 6d0df80..8bc010e 100644
--- a/tools/perf/util/ui/browser.c
+++ b/tools/perf/util/ui/browser.c
@@ -1,4 +1,3 @@
-#include <slang.h>
#include "libslang.h"
#include <linux/compiler.h>
#include <linux/list.h>
--
1.6.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/5] perf tools: Document event modifiers
2010-10-23 20:28 [GIT PULL 0/5] perf/core improvements and fixes Arnaldo Carvalho de Melo
2010-10-23 20:28 ` [PATCH 1/5] perf tools: Remove direct slang.h include Arnaldo Carvalho de Melo
@ 2010-10-23 20:28 ` Arnaldo Carvalho de Melo
2010-10-23 20:28 ` [PATCH 3/5] perf trace: Use $PERF_EXEC_PATH in canned report scripts Arnaldo Carvalho de Melo
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-23 20:28 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Sonny Rao, Ingo Molnar, Paul Mackerras,
Peter Zijlstra, Robert Richter, Arnaldo Carvalho de Melo
From: Sonny Rao <sonnyrao@linux.vnet.ibm.com>
Existing documentation doesn't discuss event modifiers, so add a description of
what's currently possible to the documentation of perf-list.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
LKML-Reference: <1287107460-12112-1-git-send-email-sonnyrao@linux.vnet.ibm.com>
Signed-off-by: Sonny Rao <sonnyrao@linux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/Documentation/perf-list.txt | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt
index 43e3dd2..399751b 100644
--- a/tools/perf/Documentation/perf-list.txt
+++ b/tools/perf/Documentation/perf-list.txt
@@ -15,6 +15,23 @@ DESCRIPTION
This command displays the symbolic event types which can be selected in the
various perf commands with the -e option.
+EVENT MODIFIERS
+---------------
+
+Events can optionally have a modifer by appending a colon and one or
+more modifiers. Modifiers allow the user to restrict when events are
+counted with 'u' for user-space, 'k' for kernel, 'h' for hypervisor.
+
+The 'p' modifier can be used for specifying how precise the instruction
+address should be. The 'p' modifier is currently only implemented for
+Intel PEBS and can be specified multiple times:
+ 0 - SAMPLE_IP can have arbitrary skid
+ 1 - SAMPLE_IP must have constant skid
+ 2 - SAMPLE_IP requested to have 0 skid
+ 3 - SAMPLE_IP must have 0 skid
+
+The PEBS implementation now supports up to 2.
+
RAW HARDWARE EVENT DESCRIPTOR
-----------------------------
Even when an event is not available in a symbolic form within perf right now,
--
1.6.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] perf trace: Use $PERF_EXEC_PATH in canned report scripts
2010-10-23 20:28 [GIT PULL 0/5] perf/core improvements and fixes Arnaldo Carvalho de Melo
2010-10-23 20:28 ` [PATCH 1/5] perf tools: Remove direct slang.h include Arnaldo Carvalho de Melo
2010-10-23 20:28 ` [PATCH 2/5] perf tools: Document event modifiers Arnaldo Carvalho de Melo
@ 2010-10-23 20:28 ` Arnaldo Carvalho de Melo
2010-10-23 20:28 ` [PATCH 4/5] perf trace: Fix detection of script extension Arnaldo Carvalho de Melo
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-23 20:28 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Ben Hutchings, Ingo Molnar, Paul Mackerras,
Peter Zijlstra, Arnaldo Carvalho de Melo
From: Ben Hutchings <ben@decadent.org.uk>
Set $PERF_EXEC_PATH before starting the record and report scripts, and
make them use it where necessary.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1286723403.2955.205.camel@localhost>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-trace.c | 6 +++---
tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +-
tools/perf/scripts/perl/bin/rw-by-file-report | 2 +-
tools/perf/scripts/perl/bin/rw-by-pid-report | 2 +-
tools/perf/scripts/perl/bin/rwtop-report | 2 +-
tools/perf/scripts/perl/bin/wakeup-latency-report | 2 +-
tools/perf/scripts/perl/bin/workqueue-stats-report | 2 +-
.../python/bin/failed-syscalls-by-pid-report | 2 +-
tools/perf/scripts/python/bin/netdev-times-report | 2 +-
.../perf/scripts/python/bin/sched-migration-report | 2 +-
tools/perf/scripts/python/bin/sctop-report | 2 +-
.../python/bin/syscall-counts-by-pid-report | 2 +-
.../perf/scripts/python/bin/syscall-counts-report | 2 +-
13 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 40a6a29..3ea6219 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -46,9 +46,6 @@ static struct scripting_ops *scripting_ops;
static void setup_scripting(void)
{
- /* make sure PERF_EXEC_PATH is set for scripts */
- perf_set_argv_exec_path(perf_exec_path());
-
setup_perl_scripting();
setup_python_scripting();
@@ -593,6 +590,9 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
suffix = REPORT_SUFFIX;
}
+ /* make sure PERF_EXEC_PATH is set for scripts */
+ perf_set_argv_exec_path(perf_exec_path());
+
if (!suffix && argc >= 2 && strncmp(argv[1], "-", strlen("-")) != 0) {
char *record_script_path, *report_script_path;
int live_pipe[2];
diff --git a/tools/perf/scripts/perl/bin/failed-syscalls-report b/tools/perf/scripts/perl/bin/failed-syscalls-report
index e3a5e55..4028d92 100644
--- a/tools/perf/scripts/perl/bin/failed-syscalls-report
+++ b/tools/perf/scripts/perl/bin/failed-syscalls-report
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
shift
fi
fi
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/failed-syscalls.pl $comm
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/failed-syscalls.pl $comm
diff --git a/tools/perf/scripts/perl/bin/rw-by-file-report b/tools/perf/scripts/perl/bin/rw-by-file-report
index d83070b..ba25f4d 100644
--- a/tools/perf/scripts/perl/bin/rw-by-file-report
+++ b/tools/perf/scripts/perl/bin/rw-by-file-report
@@ -7,7 +7,7 @@ if [ $# -lt 1 ] ; then
fi
comm=$1
shift
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/rw-by-file.pl $comm
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-file.pl $comm
diff --git a/tools/perf/scripts/perl/bin/rw-by-pid-report b/tools/perf/scripts/perl/bin/rw-by-pid-report
index 7ef4698..641a3f5 100644
--- a/tools/perf/scripts/perl/bin/rw-by-pid-report
+++ b/tools/perf/scripts/perl/bin/rw-by-pid-report
@@ -1,6 +1,6 @@
#!/bin/bash
# description: system-wide r/w activity
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/rw-by-pid.pl
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rw-by-pid.pl
diff --git a/tools/perf/scripts/perl/bin/rwtop-report b/tools/perf/scripts/perl/bin/rwtop-report
index 93e698c..4918dba 100644
--- a/tools/perf/scripts/perl/bin/rwtop-report
+++ b/tools/perf/scripts/perl/bin/rwtop-report
@@ -17,7 +17,7 @@ if [ "$n_args" -gt 0 ] ; then
interval=$1
shift
fi
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/rwtop.pl $interval
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/rwtop.pl $interval
diff --git a/tools/perf/scripts/perl/bin/wakeup-latency-report b/tools/perf/scripts/perl/bin/wakeup-latency-report
index a0d898f..49052eb 100644
--- a/tools/perf/scripts/perl/bin/wakeup-latency-report
+++ b/tools/perf/scripts/perl/bin/wakeup-latency-report
@@ -1,6 +1,6 @@
#!/bin/bash
# description: system-wide min/max/avg wakeup latency
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/wakeup-latency.pl
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/wakeup-latency.pl
diff --git a/tools/perf/scripts/perl/bin/workqueue-stats-report b/tools/perf/scripts/perl/bin/workqueue-stats-report
index 3508113..df0c65f 100644
--- a/tools/perf/scripts/perl/bin/workqueue-stats-report
+++ b/tools/perf/scripts/perl/bin/workqueue-stats-report
@@ -1,6 +1,6 @@
#!/bin/bash
# description: workqueue stats (ins/exe/create/destroy)
-perf trace $@ -s ~/libexec/perf-core/scripts/perl/workqueue-stats.pl
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/perl/workqueue-stats.pl
diff --git a/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report b/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
index 3029354..0358702 100644
--- a/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
+++ b/tools/perf/scripts/python/bin/failed-syscalls-by-pid-report
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
shift
fi
fi
-perf trace $@ -s ~/libexec/perf-core/scripts/python/failed-syscalls-by-pid.py $comm
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/failed-syscalls-by-pid.py $comm
diff --git a/tools/perf/scripts/python/bin/netdev-times-report b/tools/perf/scripts/python/bin/netdev-times-report
index c3d0a63..4ad361b 100644
--- a/tools/perf/scripts/python/bin/netdev-times-report
+++ b/tools/perf/scripts/python/bin/netdev-times-report
@@ -2,4 +2,4 @@
# description: display a process of packet and processing time
# args: [tx] [rx] [dev=] [debug]
-perf trace -s ~/libexec/perf-core/scripts/python/netdev-times.py $@
+perf trace -s "$PERF_EXEC_PATH"/scripts/python/netdev-times.py $@
diff --git a/tools/perf/scripts/python/bin/sched-migration-report b/tools/perf/scripts/python/bin/sched-migration-report
index 61d05f7..df1791f 100644
--- a/tools/perf/scripts/python/bin/sched-migration-report
+++ b/tools/perf/scripts/python/bin/sched-migration-report
@@ -1,3 +1,3 @@
#!/bin/bash
# description: sched migration overview
-perf trace $@ -s ~/libexec/perf-core/scripts/python/sched-migration.py
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/sched-migration.py
diff --git a/tools/perf/scripts/python/bin/sctop-report b/tools/perf/scripts/python/bin/sctop-report
index b01c842..36b409c 100644
--- a/tools/perf/scripts/python/bin/sctop-report
+++ b/tools/perf/scripts/python/bin/sctop-report
@@ -21,4 +21,4 @@ elif [ "$n_args" -gt 0 ] ; then
interval=$1
shift
fi
-perf trace $@ -s ~/libexec/perf-core/scripts/python/sctop.py $comm $interval
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/sctop.py $comm $interval
diff --git a/tools/perf/scripts/python/bin/syscall-counts-by-pid-report b/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
index 9e9d8dd..4eb88c9 100644
--- a/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
+++ b/tools/perf/scripts/python/bin/syscall-counts-by-pid-report
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
shift
fi
fi
-perf trace $@ -s ~/libexec/perf-core/scripts/python/syscall-counts-by-pid.py $comm
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/syscall-counts-by-pid.py $comm
diff --git a/tools/perf/scripts/python/bin/syscall-counts-report b/tools/perf/scripts/python/bin/syscall-counts-report
index dc076b6..cb2f9c5 100644
--- a/tools/perf/scripts/python/bin/syscall-counts-report
+++ b/tools/perf/scripts/python/bin/syscall-counts-report
@@ -7,4 +7,4 @@ if [ $# -gt 0 ] ; then
shift
fi
fi
-perf trace $@ -s ~/libexec/perf-core/scripts/python/syscall-counts.py $comm
+perf trace $@ -s "$PERF_EXEC_PATH"/scripts/python/syscall-counts.py $comm
--
1.6.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] perf trace: Fix detection of script extension
2010-10-23 20:28 [GIT PULL 0/5] perf/core improvements and fixes Arnaldo Carvalho de Melo
` (2 preceding siblings ...)
2010-10-23 20:28 ` [PATCH 3/5] perf trace: Use $PERF_EXEC_PATH in canned report scripts Arnaldo Carvalho de Melo
@ 2010-10-23 20:28 ` Arnaldo Carvalho de Melo
2010-10-23 20:28 ` [PATCH 5/5] perf probe: Fix format specified for Dwarf_Off parameter Arnaldo Carvalho de Melo
2010-10-24 9:39 ` [GIT PULL 0/5] perf/core improvements and fixes Ingo Molnar
5 siblings, 0 replies; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-23 20:28 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Ben Hutchings, Ingo Molnar, Paul Mackerras,
Peter Zijlstra, Arnaldo Carvalho de Melo
From: Ben Hutchings <ben@decadent.org.uk>
The extension starts with the last dot in the name, not the first.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1286723462.2955.206.camel@localhost>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-trace.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 3ea6219..deda1a9 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -282,7 +282,7 @@ static int parse_scriptname(const struct option *opt __used,
script++;
} else {
script = str;
- ext = strchr(script, '.');
+ ext = strrchr(script, '.');
if (!ext) {
fprintf(stderr, "invalid script extension");
return -1;
--
1.6.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] perf probe: Fix format specified for Dwarf_Off parameter
2010-10-23 20:28 [GIT PULL 0/5] perf/core improvements and fixes Arnaldo Carvalho de Melo
` (3 preceding siblings ...)
2010-10-23 20:28 ` [PATCH 4/5] perf trace: Fix detection of script extension Arnaldo Carvalho de Melo
@ 2010-10-23 20:28 ` Arnaldo Carvalho de Melo
2010-10-25 6:35 ` Masami Hiramatsu
2010-10-25 6:36 ` Masami Hiramatsu
2010-10-24 9:39 ` [GIT PULL 0/5] perf/core improvements and fixes Ingo Molnar
5 siblings, 2 replies; 9+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-10-23 20:28 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Frederic Weisbecker,
Masami Hiramatsu
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Fixing the following error on 32-bit arches:
util/probe-finder.c: In function ‘line_range_search_cb’:
util/probe-finder.c:1734: error: format ‘%lx’ expects type ‘long
unsigned int’, but argument 3 has type ‘Dwarf_Off’
Reported-by: Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/probe-finder.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index c20bd52..3991d73 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -1731,7 +1731,8 @@ static int line_range_search_cb(Dwarf_Die *sp_die, void *data)
struct line_finder *lf = param->data;
struct line_range *lr = lf->lr;
- pr_debug("find (%lx) %s\n", dwarf_dieoffset(sp_die),
+ pr_debug("find (%llx) %s\n",
+ (unsigned long long)dwarf_dieoffset(sp_die),
dwarf_diename(sp_die));
if (dwarf_tag(sp_die) == DW_TAG_subprogram &&
die_compare_name(sp_die, lr->function)) {
--
1.6.2.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 5/5] perf probe: Fix format specified for Dwarf_Off parameter
2010-10-23 20:28 ` [PATCH 5/5] perf probe: Fix format specified for Dwarf_Off parameter Arnaldo Carvalho de Melo
@ 2010-10-25 6:35 ` Masami Hiramatsu
2010-10-25 6:36 ` Masami Hiramatsu
1 sibling, 0 replies; 9+ messages in thread
From: Masami Hiramatsu @ 2010-10-25 6:35 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ingo Molnar, linux-kernel, Arnaldo Carvalho de Melo,
Frederic Weisbecker
(2010/10/24 5:28), Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> Fixing the following error on 32-bit arches:
>
> util/probe-finder.c: In function ‘line_range_search_cb’:
> util/probe-finder.c:1734: error: format ‘%lx’ expects type ‘long
> unsigned int’, but argument 3 has type ‘Dwarf_Off’
Oops, right. Thanks Arnaldo!
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>
> Reported-by: Ingo Molnar <mingo@elte.hu>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> LKML-Reference: <new-submission>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
> tools/perf/util/probe-finder.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
> index c20bd52..3991d73 100644
> --- a/tools/perf/util/probe-finder.c
> +++ b/tools/perf/util/probe-finder.c
> @@ -1731,7 +1731,8 @@ static int line_range_search_cb(Dwarf_Die *sp_die, void *data)
> struct line_finder *lf = param->data;
> struct line_range *lr = lf->lr;
>
> - pr_debug("find (%lx) %s\n", dwarf_dieoffset(sp_die),
> + pr_debug("find (%llx) %s\n",
> + (unsigned long long)dwarf_dieoffset(sp_die),
> dwarf_diename(sp_die));
> if (dwarf_tag(sp_die) == DW_TAG_subprogram &&
> die_compare_name(sp_die, lr->function)) {
--
Masami HIRAMATSU
2nd Dept. Linux Technology Center
Hitachi, Ltd., Systems Development Laboratory
E-mail: masami.hiramatsu.pt@hitachi.com
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 5/5] perf probe: Fix format specified for Dwarf_Off parameter
2010-10-23 20:28 ` [PATCH 5/5] perf probe: Fix format specified for Dwarf_Off parameter Arnaldo Carvalho de Melo
2010-10-25 6:35 ` Masami Hiramatsu
@ 2010-10-25 6:36 ` Masami Hiramatsu
1 sibling, 0 replies; 9+ messages in thread
From: Masami Hiramatsu @ 2010-10-25 6:36 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ingo Molnar, linux-kernel, Arnaldo Carvalho de Melo,
Frederic Weisbecker, 2nddept-manager
(2010/10/24 5:28), Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> Fixing the following error on 32-bit arches:
>
> util/probe-finder.c: In function ‘line_range_search_cb’:
> util/probe-finder.c:1734: error: format ‘%lx’ expects type ‘long
> unsigned int’, but argument 3 has type ‘Dwarf_Off’
Oops, right. Thanks Arnaldo!
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>
> Reported-by: Ingo Molnar <mingo@elte.hu>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> LKML-Reference: <new-submission>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
> tools/perf/util/probe-finder.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
> index c20bd52..3991d73 100644
> --- a/tools/perf/util/probe-finder.c
> +++ b/tools/perf/util/probe-finder.c
> @@ -1731,7 +1731,8 @@ static int line_range_search_cb(Dwarf_Die *sp_die, void *data)
> struct line_finder *lf = param->data;
> struct line_range *lr = lf->lr;
>
> - pr_debug("find (%lx) %s\n", dwarf_dieoffset(sp_die),
> + pr_debug("find (%llx) %s\n",
> + (unsigned long long)dwarf_dieoffset(sp_die),
> dwarf_diename(sp_die));
> if (dwarf_tag(sp_die) == DW_TAG_subprogram &&
> die_compare_name(sp_die, lr->function)) {
--
Masami HIRAMATSU
2nd Dept. Linux Technology Center
Hitachi, Ltd., Systems Development Laboratory
E-mail: masami.hiramatsu.pt@hitachi.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL 0/5] perf/core improvements and fixes
2010-10-23 20:28 [GIT PULL 0/5] perf/core improvements and fixes Arnaldo Carvalho de Melo
` (4 preceding siblings ...)
2010-10-23 20:28 ` [PATCH 5/5] perf probe: Fix format specified for Dwarf_Off parameter Arnaldo Carvalho de Melo
@ 2010-10-24 9:39 ` Ingo Molnar
5 siblings, 0 replies; 9+ messages in thread
From: Ingo Molnar @ 2010-10-24 9:39 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Ben Hutchings, Frederic Weisbecker,
Masami Hiramatsu, Mike Galbraith, Paul Mackerras, Peter Zijlstra,
Robert Richter, Sonny Rao, 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/core
>
> Regards,
>
> - Arnaldo
>
> Arnaldo Carvalho de Melo (2):
> perf tools: Remove direct slang.h include
> perf probe: Fix format specified for Dwarf_Off parameter
>
> Ben Hutchings (2):
> perf trace: Use $PERF_EXEC_PATH in canned report scripts
> perf trace: Fix detection of script extension
>
> Sonny Rao (1):
> perf tools: Document event modifiers
>
> tools/perf/Documentation/perf-list.txt | 17 +++++++++++++++++
> tools/perf/builtin-trace.c | 8 ++++----
> tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +-
> tools/perf/scripts/perl/bin/rw-by-file-report | 2 +-
> tools/perf/scripts/perl/bin/rw-by-pid-report | 2 +-
> tools/perf/scripts/perl/bin/rwtop-report | 2 +-
> tools/perf/scripts/perl/bin/wakeup-latency-report | 2 +-
> tools/perf/scripts/perl/bin/workqueue-stats-report | 2 +-
> .../python/bin/failed-syscalls-by-pid-report | 2 +-
> tools/perf/scripts/python/bin/netdev-times-report | 2 +-
> .../perf/scripts/python/bin/sched-migration-report | 2 +-
> tools/perf/scripts/python/bin/sctop-report | 2 +-
> .../python/bin/syscall-counts-by-pid-report | 2 +-
> .../perf/scripts/python/bin/syscall-counts-report | 2 +-
> tools/perf/util/probe-finder.c | 3 ++-
> tools/perf/util/ui/browser.c | 1 -
> 16 files changed, 35 insertions(+), 18 deletions(-)
Pulled, thanks Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 9+ messages in thread