* [GIT PULL 0/9] perf/core fixes and improvements
@ 2010-08-10 20:15 Arnaldo Carvalho de Melo
0 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-08-10 20:15 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Dave Martin,
Frederic Weisbecker, Mike Galbraith, Peter Zijlstra,
Stephane Eranian
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 (8):
perf ui: Shorten ui_browser member names
perf ui: Move ui_helpline routines to separate file in util/ui/
perf ui: Move ui_progress routines to separate file in util/ui/
perf ui: Move annotate browser to util/ui/browsers/
perf ui: Move map browser to util/ui/browsers/
perf ui: Move hists browser to util/ui/browsers/
perf ui: Complete the breakdown of util/newt.c
perf annotate: Sort by hottest lines in the TUI
Dave Martin (1):
perf symbols: Ignore mapping symbols on ARM
tools/perf/Makefile | 25 +-
tools/perf/builtin-annotate.c | 2 +-
tools/perf/util/debug.c | 2 +-
tools/perf/util/debug.h | 9 +-
tools/perf/util/hist.c | 13 +-
tools/perf/util/hist.h | 3 +-
tools/perf/util/newt.c | 1487 --------------------------------
tools/perf/util/pstack.h | 2 +
tools/perf/util/symbol.c | 10 +
tools/perf/util/ui/browser.c | 57 +-
tools/perf/util/ui/browser.h | 7 +-
tools/perf/util/ui/browsers/annotate.c | 191 ++++
tools/perf/util/ui/browsers/hists.c | 946 ++++++++++++++++++++
tools/perf/util/ui/browsers/map.c | 163 ++++
tools/perf/util/ui/browsers/map.h | 6 +
tools/perf/util/ui/helpline.c | 69 ++
tools/perf/util/ui/helpline.h | 10 +
tools/perf/util/ui/libslang.h | 27 +
tools/perf/util/ui/progress.c | 60 ++
tools/perf/util/ui/progress.h | 11 +
tools/perf/util/ui/setup.c | 42 +
tools/perf/util/ui/util.c | 114 +++
tools/perf/util/ui/util.h | 10 +
23 files changed, 1729 insertions(+), 1537 deletions(-)
delete mode 100644 tools/perf/util/newt.c
create mode 100644 tools/perf/util/ui/browsers/annotate.c
create mode 100644 tools/perf/util/ui/browsers/hists.c
create mode 100644 tools/perf/util/ui/browsers/map.c
create mode 100644 tools/perf/util/ui/browsers/map.h
create mode 100644 tools/perf/util/ui/helpline.c
create mode 100644 tools/perf/util/ui/helpline.h
create mode 100644 tools/perf/util/ui/libslang.h
create mode 100644 tools/perf/util/ui/progress.c
create mode 100644 tools/perf/util/ui/progress.h
create mode 100644 tools/perf/util/ui/setup.c
create mode 100644 tools/perf/util/ui/util.c
create mode 100644 tools/perf/util/ui/util.h
^ permalink raw reply [flat|nested] 17+ messages in thread
* [GIT PULL 0/9] perf/core fixes and improvements
@ 2011-06-02 20:56 Arnaldo Carvalho de Melo
2011-06-03 15:05 ` Ingo Molnar
0 siblings, 1 reply; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2011-06-02 20:56 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, David Ahern,
Frederic Weisbecker, Mike Galbraith, Paul Mackerras,
Peter Zijlstra, Stephane Eranian, Thomas Gleixner, Tom Zanussi,
Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling from:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
Regards,
- Arnaldo
Arnaldo Carvalho de Melo (3):
perf evlist: Remove dependency on debug routines
perf python: Use exception to propagate errors
perf evlist: Don't die if sample_{id_all|type} is invalid
David Ahern (4):
perf stat: clarify unsupported events from uncounted events
perf script: "sym" field really means show IP data
perf script: Make printing of dso a separate field option
perf script: Add printing of sample address
Frederic Weisbecker (2):
perf python: Fix argument name list of read_on_cpu()
perf python: Cleanup useless double NULL termination in method arg names
tools/perf/Documentation/perf-script.txt | 12 ++--
tools/perf/builtin-script.c | 108 +++++++++++++++++++++++++++---
tools/perf/builtin-stat.c | 9 ++-
tools/perf/builtin-test.c | 2 +-
tools/perf/util/event.c | 16 -----
tools/perf/util/event.h | 2 -
tools/perf/util/evlist.c | 68 +++++++++++--------
tools/perf/util/evlist.h | 6 +-
tools/perf/util/evsel.c | 17 +++++
tools/perf/util/evsel.h | 8 ++
tools/perf/util/python.c | 29 ++++----
tools/perf/util/session.c | 73 ++++++++++++++-------
tools/perf/util/session.h | 5 +-
13 files changed, 245 insertions(+), 110 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [GIT PULL 0/9] perf/core fixes and improvements
2011-06-02 20:56 Arnaldo Carvalho de Melo
@ 2011-06-03 15:05 ` Ingo Molnar
0 siblings, 0 replies; 17+ messages in thread
From: Ingo Molnar @ 2011-06-03 15:05 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, David Ahern, Frederic Weisbecker, Mike Galbraith,
Paul Mackerras, Peter Zijlstra, Stephane Eranian, Thomas Gleixner,
Tom Zanussi, Arnaldo Carvalho de Melo
* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:
> Hi Ingo,
>
> Please consider pulling from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/core
>
> Regards,
>
> - Arnaldo
>
> Arnaldo Carvalho de Melo (3):
> perf evlist: Remove dependency on debug routines
> perf python: Use exception to propagate errors
> perf evlist: Don't die if sample_{id_all|type} is invalid
>
> David Ahern (4):
> perf stat: clarify unsupported events from uncounted events
> perf script: "sym" field really means show IP data
> perf script: Make printing of dso a separate field option
> perf script: Add printing of sample address
>
> Frederic Weisbecker (2):
> perf python: Fix argument name list of read_on_cpu()
> perf python: Cleanup useless double NULL termination in method arg names
>
> tools/perf/Documentation/perf-script.txt | 12 ++--
> tools/perf/builtin-script.c | 108 +++++++++++++++++++++++++++---
> tools/perf/builtin-stat.c | 9 ++-
> tools/perf/builtin-test.c | 2 +-
> tools/perf/util/event.c | 16 -----
> tools/perf/util/event.h | 2 -
> tools/perf/util/evlist.c | 68 +++++++++++--------
> tools/perf/util/evlist.h | 6 +-
> tools/perf/util/evsel.c | 17 +++++
> tools/perf/util/evsel.h | 8 ++
> tools/perf/util/python.c | 29 ++++----
> tools/perf/util/session.c | 73 ++++++++++++++-------
> tools/perf/util/session.h | 5 +-
> 13 files changed, 245 insertions(+), 110 deletions(-)
Pulled, thanks a lot Arnaldo!
Mind cherry-picking the fixes into perf/urgent?
Thanks,
Ingo
^ permalink raw reply [flat|nested] 17+ messages in thread
* [GIT PULL 0/9] perf/core fixes and improvements
@ 2012-01-08 15:42 Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 1/9] perf script: Add missing closedir() calls Arnaldo Carvalho de Melo
` (9 more replies)
0 siblings, 10 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Joerg Roedel,
Namhyung Kim, Paul Mackerras, Peter Zijlstra, arnaldo.melo
Hi Ingo,
Please consider pulling.
Regards,
- Arnaldo
The following changes since commit b9f616bbf4a917398aa09db89efbdf9a204e80dc:
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2012-01-08 12:36:18 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux perf/core
for you to fetch changes up to 172d1b0b73256551f100fc00c69e356d047103f5:
perf tools: Fix compile error on x86_64 Ubuntu (2012-01-08 13:34:55 -0200)
----------------------------------------------------------------
Namhyung Kim (9):
perf script: Add missing closedir() calls
perf test: Change type of '-v' option to INCR
perf top: Add error message for EMFILE
perf kmem: Add missing closedir() calls
perf kmem: Fix a memory leak
perf annotate: Fix usage string
perf annotate: Get rid of field_sep check
perf report: Fix --stdio output alignment when --showcpuutilization used
perf tools: Fix compile error on x86_64 Ubuntu
tools/perf/builtin-annotate.c | 7 +------
tools/perf/builtin-kmem.c | 3 +++
tools/perf/builtin-script.c | 4 ++++
tools/perf/builtin-test.c | 2 +-
tools/perf/builtin-top.c | 4 ++++
tools/perf/util/hist.c | 34 ++++++++++++++++++----------------
tools/perf/util/trace-event-info.c | 1 -
7 files changed, 31 insertions(+), 24 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/9] perf script: Add missing closedir() calls
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 2/9] perf test: Change type of '-v' option to INCR Arnaldo Carvalho de Melo
` (8 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
The get_script_path() calls opendir() but misses corresponding
closedir()'s. Add them.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-1-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-script.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index fd1909a..bb68ddf 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1018,13 +1018,17 @@ static char *get_script_path(const char *script_root, const char *suffix)
__script_root = get_script_root(&script_dirent, suffix);
if (__script_root && !strcmp(script_root, __script_root)) {
free(__script_root);
+ closedir(lang_dir);
+ closedir(scripts_dir);
snprintf(script_path, MAXPATHLEN, "%s/%s",
lang_path, script_dirent.d_name);
return strdup(script_path);
}
free(__script_root);
}
+ closedir(lang_dir);
}
+ closedir(scripts_dir);
return NULL;
}
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/9] perf test: Change type of '-v' option to INCR
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 1/9] perf script: Add missing closedir() calls Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 3/9] perf top: Add error message for EMFILE Arnaldo Carvalho de Melo
` (7 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
The '-v' option is usually defined via OPT_INCR not _INTEGER. Follow
the trend :).
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-2-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-test.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 2b9a7f4..3854e86 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -1396,7 +1396,7 @@ int cmd_test(int argc, const char **argv, const char *prefix __used)
NULL,
};
const struct option test_options[] = {
- OPT_INTEGER('v', "verbose", &verbose,
+ OPT_INCR('v', "verbose", &verbose,
"be more verbose (show symbol address, etc)"),
OPT_END()
};
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/9] perf top: Add error message for EMFILE
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 1/9] perf script: Add missing closedir() calls Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 2/9] perf test: Change type of '-v' option to INCR Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 4/9] perf kmem: Add missing closedir() calls Arnaldo Carvalho de Melo
` (6 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
When a user tries to open so many events, perf_event_open syscall may
fail with EMFILE. Provide advise for that case.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-3-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-top.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index d89dec9..8f80df8 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -888,6 +888,10 @@ try_again:
ui__warning("The %s event is not supported.\n",
event_name(counter));
goto out_err;
+ } else if (err == EMFILE) {
+ ui__warning("Too many events are opened.\n"
+ "Try again after reducing the number of events\n");
+ goto out_err;
}
ui__warning("The sys_perf_event_open() syscall "
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/9] perf kmem: Add missing closedir() calls
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
` (2 preceding siblings ...)
2012-01-08 15:42 ` [PATCH 3/9] perf top: Add error message for EMFILE Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 5/9] perf kmem: Fix a memory leak Arnaldo Carvalho de Melo
` (5 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
The setup_cpunode_map() calls opendir() but misses corresponding
closedir(). Add them.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-4-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-kmem.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index fe1ad8f..7a9b5c5 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -108,7 +108,9 @@ static void setup_cpunode_map(void)
continue;
cpunode_map[cpu] = mem;
}
+ closedir(dir2);
}
+ closedir(dir1);
}
static void insert_alloc_stat(unsigned long call_site, unsigned long ptr,
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 5/9] perf kmem: Fix a memory leak
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
` (3 preceding siblings ...)
2012-01-08 15:42 ` [PATCH 4/9] perf kmem: Add missing closedir() calls Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 6/9] perf annotate: Fix usage string Arnaldo Carvalho de Melo
` (4 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
The 'str' should be freed when sort_dimension__add() failed too.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-5-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-kmem.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 7a9b5c5..39104c0 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -647,6 +647,7 @@ static int setup_sorting(struct list_head *sort_list, const char *arg)
break;
if (sort_dimension__add(tok, sort_list) < 0) {
error("Unknown --sort key: '%s'", tok);
+ free(str);
return -1;
}
}
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 6/9] perf annotate: Fix usage string
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
` (4 preceding siblings ...)
2012-01-08 15:42 ` [PATCH 5/9] perf kmem: Fix a memory leak Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 7/9] perf annotate: Get rid of field_sep check Arnaldo Carvalho de Melo
` (3 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
The annotate command doesn't take non-option arguments.
In fact, it can take last argument as a symbol filter though, but that's
a special case and, IMHO, it should be discouraged in favor of the -s
option.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-6-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-annotate.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 214ba7f..3ec2496 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -235,7 +235,7 @@ out_delete:
}
static const char * const annotate_usage[] = {
- "perf annotate [<options>] <command>",
+ "perf annotate [<options>]",
NULL
};
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 7/9] perf annotate: Get rid of field_sep check
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
` (5 preceding siblings ...)
2012-01-08 15:42 ` [PATCH 6/9] perf annotate: Fix usage string Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 16:11 ` Namhyung Kim
2012-01-08 15:42 ` [PATCH 8/9] perf report: Fix --stdio output alignment when --showcpuutilization used Arnaldo Carvalho de Melo
` (2 subsequent siblings)
9 siblings, 1 reply; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
The 'field_sep' variable is not set anywhere. Just remove the
conditional.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-7-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-annotate.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 3ec2496..806e0a2 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -313,10 +313,5 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used)
annotate.sym_hist_filter = argv[0];
}
- if (field_sep && *field_sep == '.') {
- pr_err("'.' is the only non valid --field-separator argument\n");
- return -1;
- }
-
return __cmd_annotate(&annotate);
}
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 8/9] perf report: Fix --stdio output alignment when --showcpuutilization used
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
` (6 preceding siblings ...)
2012-01-08 15:42 ` [PATCH 7/9] perf annotate: Get rid of field_sep check Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 9/9] perf tools: Fix compile error on x86_64 Ubuntu Arnaldo Carvalho de Melo
2012-01-08 16:02 ` [GIT PULL 0/9] perf/core fixes and improvements Ingo Molnar
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
Current perf report output is broken if --showcpuutilization is used.
Combination with -n and/or --show-total-period make things worse.
This patch fixes it as follows:
before:
48.25% 48.25% 0.00% sleep [kernel.kallsyms] [k] trace_hardirqs_off
34.99% 34.99% 0.00% sleep [kernel.kallsyms] [k] __find_get_block_slow
15.99% 15.99% 0.00% sleep [kernel.kallsyms] [k] lock_release_holdtime
0.77% 0.77% 0.00% sleep [kernel.kallsyms] [k] native_write_msr_safe
after:
48.25% 48.25% 0.00% sleep [kernel.kallsyms] [k] trace_hardirqs_off
34.99% 34.99% 0.00% sleep [kernel.kallsyms] [k] __find_get_block_slow
15.99% 15.99% 0.00% sleep [kernel.kallsyms] [k] lock_release_holdtime
0.77% 0.77% 0.00% sleep [kernel.kallsyms] [k] native_write_msr_safe
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1325957132-10600-8-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/hist.c | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 4df4495..6f505d1 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -919,20 +919,6 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
fprintf(fp, "# %s", pair ? "Baseline" : "Overhead");
- if (symbol_conf.show_nr_samples) {
- if (sep)
- fprintf(fp, "%cSamples", *sep);
- else
- fputs(" Samples ", fp);
- }
-
- if (symbol_conf.show_total_period) {
- if (sep)
- ret += fprintf(fp, "%cPeriod", *sep);
- else
- ret += fprintf(fp, " Period ");
- }
-
if (symbol_conf.show_cpu_utilization) {
if (sep) {
ret += fprintf(fp, "%csys", *sep);
@@ -942,8 +928,8 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
ret += fprintf(fp, "%cguest us", *sep);
}
} else {
- ret += fprintf(fp, " sys ");
- ret += fprintf(fp, " us ");
+ ret += fprintf(fp, " sys ");
+ ret += fprintf(fp, " us ");
if (perf_guest) {
ret += fprintf(fp, " guest sys ");
ret += fprintf(fp, " guest us ");
@@ -951,6 +937,20 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
}
}
+ if (symbol_conf.show_nr_samples) {
+ if (sep)
+ fprintf(fp, "%cSamples", *sep);
+ else
+ fputs(" Samples ", fp);
+ }
+
+ if (symbol_conf.show_total_period) {
+ if (sep)
+ ret += fprintf(fp, "%cPeriod", *sep);
+ else
+ ret += fprintf(fp, " Period ");
+ }
+
if (pair) {
if (sep)
ret += fprintf(fp, "%cDelta", *sep);
@@ -995,6 +995,8 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
goto print_entries;
fprintf(fp, "# ........");
+ if (symbol_conf.show_cpu_utilization)
+ fprintf(fp, " ....... .......");
if (symbol_conf.show_nr_samples)
fprintf(fp, " ..........");
if (symbol_conf.show_total_period)
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 9/9] perf tools: Fix compile error on x86_64 Ubuntu
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
` (7 preceding siblings ...)
2012-01-08 15:42 ` [PATCH 8/9] perf report: Fix --stdio output alignment when --showcpuutilization used Arnaldo Carvalho de Melo
@ 2012-01-08 15:42 ` Arnaldo Carvalho de Melo
2012-01-08 16:02 ` [GIT PULL 0/9] perf/core fixes and improvements Ingo Molnar
9 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-08 15:42 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Namhyung Kim, Joerg Roedel, Paul Mackerras,
Peter Zijlstra, Arnaldo Carvalho de Melo
From: Namhyung Kim <namhyung@gmail.com>
The ctype.h include is not needed here and it breaks build on some systems (at
least 64bit Ubuntu 10.04) like below. Just get rid of it.
CC util/trace-event-info.o
cc1: warnings being treated as errors
util/trace-event-info.c: In function ‘record_file’:
util/trace-event-info.c:192: error: implicit declaration of function ‘pwrite’
util/trace-event-info.c:192: error: nested extern declaration of ‘pwrite’
make: *** [util/trace-event-info.o] Error 1
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1326035430-7621-1-git-send-email-namhyung@gmail.com
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/trace-event-info.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index ac6830d..fc22cf5 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -18,7 +18,6 @@
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
-#include <ctype.h>
#include "util.h"
#include <dirent.h>
#include <mntent.h>
--
1.7.8.GIT
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [GIT PULL 0/9] perf/core fixes and improvements
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
` (8 preceding siblings ...)
2012-01-08 15:42 ` [PATCH 9/9] perf tools: Fix compile error on x86_64 Ubuntu Arnaldo Carvalho de Melo
@ 2012-01-08 16:02 ` Ingo Molnar
9 siblings, 0 replies; 17+ messages in thread
From: Ingo Molnar @ 2012-01-08 16:02 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Joerg Roedel, Namhyung Kim, Paul Mackerras,
Peter Zijlstra, arnaldo.melo
* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:
> Hi Ingo,
>
> Please consider pulling.
>
> Regards,
>
> - Arnaldo
>
> The following changes since commit b9f616bbf4a917398aa09db89efbdf9a204e80dc:
>
> Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2012-01-08 12:36:18 +0100)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux perf/core
>
> for you to fetch changes up to 172d1b0b73256551f100fc00c69e356d047103f5:
>
> perf tools: Fix compile error on x86_64 Ubuntu (2012-01-08 13:34:55 -0200)
>
> ----------------------------------------------------------------
> Namhyung Kim (9):
> perf script: Add missing closedir() calls
> perf test: Change type of '-v' option to INCR
> perf top: Add error message for EMFILE
> perf kmem: Add missing closedir() calls
> perf kmem: Fix a memory leak
> perf annotate: Fix usage string
> perf annotate: Get rid of field_sep check
> perf report: Fix --stdio output alignment when --showcpuutilization used
> perf tools: Fix compile error on x86_64 Ubuntu
>
> tools/perf/builtin-annotate.c | 7 +------
> tools/perf/builtin-kmem.c | 3 +++
> tools/perf/builtin-script.c | 4 ++++
> tools/perf/builtin-test.c | 2 +-
> tools/perf/builtin-top.c | 4 ++++
> tools/perf/util/hist.c | 34 ++++++++++++++++++----------------
> tools/perf/util/trace-event-info.c | 1 -
> 7 files changed, 31 insertions(+), 24 deletions(-)
Pulled, thanks Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 7/9] perf annotate: Get rid of field_sep check
2012-01-08 15:42 ` [PATCH 7/9] perf annotate: Get rid of field_sep check Arnaldo Carvalho de Melo
@ 2012-01-08 16:11 ` Namhyung Kim
0 siblings, 0 replies; 17+ messages in thread
From: Namhyung Kim @ 2012-01-08 16:11 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ingo Molnar, linux-kernel, Paul Mackerras, Peter Zijlstra,
Arnaldo Carvalho de Melo
2012-01-08 (Sun), 13:42 -0200, Arnaldo Carvalho de Melo wrote:
> From: Namhyung Kim <namhyung@gmail.com>
>
> The 'field_sep' variable is not set anywhere. Just remove the
> conditional.
>
BTW, it seems there's no user of the variable now. Maybe a candidate
for removal?
Thanks.
--
Regards,
Namhyung Kim
^ permalink raw reply [flat|nested] 17+ messages in thread
* [GIT PULL 0/9] perf/core fixes and improvements
@ 2012-01-31 1:24 Arnaldo Carvalho de Melo
2012-01-31 12:06 ` Ingo Molnar
0 siblings, 1 reply; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2012-01-31 1:24 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Akihiro Nagai,
David Ahern, Frederic Weisbecker, Hitoshi Mitake,
Masami Hiramatsu, Masanari Iida, Mike Galbraith, Namhyung Kim,
Paul Mackerras, Peter Zijlstra, Stephane Eranian,
yrl.pp-manager.tt, arnaldo.melo
The following changes since commit efb3040d481a1594592b1defb4526c406c7a4751:
jump_label: Add some documentation (2012-01-27 12:14:46 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux perf-core-for-mingo
for you to fetch changes up to cfeb1d90a1b1db96383b48888cb7a5f10ca12e12:
perf python: Use attr.watermark in twatch.py (2012-01-30 18:38:23 -0200)
----------------------------------------------------------------
perf/core fixes and improvements.
----------------------------------------------------------------
Akihiro Nagai (4):
perf script: Unify the expressions indicating "unknown"
perf script: Print branch_from and branch_to of BTS events
perf script: Add the offset field specifier
perf script: Add option resolving vmlinux path
Arnaldo Carvalho de Melo (1):
perf python: Use attr.watermark in twatch.py
Masanari Iida (1):
perf evsel: Fix spelling typo
Namhyung Kim (2):
perf lock: Document lock info subcommand
perf tools: Remove unnecessary ctype.h inclusion
Stephane Eranian (1):
perf top: Fix number of samples displayed
tools/perf/Documentation/perf-lock.txt | 20 ++++-
tools/perf/Documentation/perf-script.txt | 5 +-
tools/perf/bench/mem-memcpy.c | 1 -
tools/perf/bench/mem-memset.c | 1 -
tools/perf/builtin-lock.c | 4 +-
tools/perf/builtin-script.c | 80 ++++++++++++++++----
tools/perf/builtin-top.c | 13 +++-
tools/perf/python/twatch.py | 2 +-
tools/perf/util/evsel.c | 2 +-
tools/perf/util/map.c | 15 ++++
tools/perf/util/map.h | 1 +
tools/perf/util/probe-finder.c | 1 -
.../util/scripting-engines/trace-event-python.c | 1 -
tools/perf/util/session.c | 39 ++++------
tools/perf/util/session.h | 2 +-
tools/perf/util/symbol.c | 22 ++++++
tools/perf/util/symbol.h | 4 +
tools/perf/util/trace-event-parse.c | 1 -
tools/perf/util/trace-event-read.c | 1 -
tools/perf/util/trace-event-scripting.c | 1 -
tools/perf/util/ui/browsers/map.c | 2 +-
21 files changed, 159 insertions(+), 59 deletions(-)
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [GIT PULL 0/9] perf/core fixes and improvements
2012-01-31 1:24 Arnaldo Carvalho de Melo
@ 2012-01-31 12:06 ` Ingo Molnar
0 siblings, 0 replies; 17+ messages in thread
From: Ingo Molnar @ 2012-01-31 12:06 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Akihiro Nagai, David Ahern, Frederic Weisbecker,
Hitoshi Mitake, Masami Hiramatsu, Masanari Iida, Mike Galbraith,
Namhyung Kim, Paul Mackerras, Peter Zijlstra, Stephane Eranian,
yrl.pp-manager.tt, arnaldo.melo
* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:
> The following changes since commit efb3040d481a1594592b1defb4526c406c7a4751:
>
> jump_label: Add some documentation (2012-01-27 12:14:46 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux perf-core-for-mingo
>
> for you to fetch changes up to cfeb1d90a1b1db96383b48888cb7a5f10ca12e12:
>
> perf python: Use attr.watermark in twatch.py (2012-01-30 18:38:23 -0200)
>
> ----------------------------------------------------------------
> perf/core fixes and improvements.
>
> ----------------------------------------------------------------
> Akihiro Nagai (4):
> perf script: Unify the expressions indicating "unknown"
> perf script: Print branch_from and branch_to of BTS events
> perf script: Add the offset field specifier
> perf script: Add option resolving vmlinux path
>
> Arnaldo Carvalho de Melo (1):
> perf python: Use attr.watermark in twatch.py
>
> Masanari Iida (1):
> perf evsel: Fix spelling typo
>
> Namhyung Kim (2):
> perf lock: Document lock info subcommand
> perf tools: Remove unnecessary ctype.h inclusion
>
> Stephane Eranian (1):
> perf top: Fix number of samples displayed
>
> tools/perf/Documentation/perf-lock.txt | 20 ++++-
> tools/perf/Documentation/perf-script.txt | 5 +-
> tools/perf/bench/mem-memcpy.c | 1 -
> tools/perf/bench/mem-memset.c | 1 -
> tools/perf/builtin-lock.c | 4 +-
> tools/perf/builtin-script.c | 80 ++++++++++++++++----
> tools/perf/builtin-top.c | 13 +++-
> tools/perf/python/twatch.py | 2 +-
> tools/perf/util/evsel.c | 2 +-
> tools/perf/util/map.c | 15 ++++
> tools/perf/util/map.h | 1 +
> tools/perf/util/probe-finder.c | 1 -
> .../util/scripting-engines/trace-event-python.c | 1 -
> tools/perf/util/session.c | 39 ++++------
> tools/perf/util/session.h | 2 +-
> tools/perf/util/symbol.c | 22 ++++++
> tools/perf/util/symbol.h | 4 +
> tools/perf/util/trace-event-parse.c | 1 -
> tools/perf/util/trace-event-read.c | 1 -
> tools/perf/util/trace-event-scripting.c | 1 -
> tools/perf/util/ui/browsers/map.c | 2 +-
> 21 files changed, 159 insertions(+), 59 deletions(-)
Pulled, thanks Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2012-01-31 12:07 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-08 15:42 [GIT PULL 0/9] perf/core fixes and improvements Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 1/9] perf script: Add missing closedir() calls Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 2/9] perf test: Change type of '-v' option to INCR Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 3/9] perf top: Add error message for EMFILE Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 4/9] perf kmem: Add missing closedir() calls Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 5/9] perf kmem: Fix a memory leak Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 6/9] perf annotate: Fix usage string Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 7/9] perf annotate: Get rid of field_sep check Arnaldo Carvalho de Melo
2012-01-08 16:11 ` Namhyung Kim
2012-01-08 15:42 ` [PATCH 8/9] perf report: Fix --stdio output alignment when --showcpuutilization used Arnaldo Carvalho de Melo
2012-01-08 15:42 ` [PATCH 9/9] perf tools: Fix compile error on x86_64 Ubuntu Arnaldo Carvalho de Melo
2012-01-08 16:02 ` [GIT PULL 0/9] perf/core fixes and improvements Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2012-01-31 1:24 Arnaldo Carvalho de Melo
2012-01-31 12:06 ` Ingo Molnar
2011-06-02 20:56 Arnaldo Carvalho de Melo
2011-06-03 15:05 ` Ingo Molnar
2010-08-10 20:15 Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).