2009-06-02 15:37:05 -06:00
|
|
|
/*
|
|
|
|
* builtin-report.c
|
|
|
|
*
|
|
|
|
* Builtin report command: Analyze the perf.data input file,
|
|
|
|
* look up and read DSOs and symbol information and display
|
|
|
|
* a histogram of results, along various sorting keys.
|
|
|
|
*/
|
2009-05-27 01:10:38 -06:00
|
|
|
#include "builtin.h"
|
2009-05-26 01:17:18 -06:00
|
|
|
|
2009-06-02 15:37:05 -06:00
|
|
|
#include "util/util.h"
|
|
|
|
|
2009-06-04 07:19:47 -06:00
|
|
|
#include "util/color.h"
|
2009-07-01 11:46:08 -06:00
|
|
|
#include <linux/list.h>
|
2009-05-27 01:50:13 -06:00
|
|
|
#include "util/cache.h"
|
2009-07-01 09:28:37 -06:00
|
|
|
#include <linux/rbtree.h>
|
2009-05-28 11:55:04 -06:00
|
|
|
#include "util/symbol.h"
|
2009-06-26 08:28:01 -06:00
|
|
|
#include "util/callchain.h"
|
2009-06-30 16:01:20 -06:00
|
|
|
#include "util/strlist.h"
|
2009-08-07 05:55:24 -06:00
|
|
|
#include "util/values.h"
|
2009-05-18 09:45:42 -06:00
|
|
|
|
2009-05-26 01:17:18 -06:00
|
|
|
#include "perf.h"
|
2009-08-16 14:05:48 -06:00
|
|
|
#include "util/debug.h"
|
2009-06-25 09:05:54 -06:00
|
|
|
#include "util/header.h"
|
2009-12-11 16:24:02 -07:00
|
|
|
#include "util/session.h"
|
2009-05-26 01:17:18 -06:00
|
|
|
|
|
|
|
#include "util/parse-options.h"
|
|
|
|
#include "util/parse-events.h"
|
|
|
|
|
2009-08-14 04:21:53 -06:00
|
|
|
#include "util/thread.h"
|
2009-09-24 10:02:49 -06:00
|
|
|
#include "util/sort.h"
|
2009-09-28 07:32:55 -06:00
|
|
|
#include "util/hist.h"
|
2009-08-14 04:21:53 -06:00
|
|
|
|
2009-05-27 01:33:18 -06:00
|
|
|
static char const *input_name = "perf.data";
|
2009-06-04 06:13:04 -06:00
|
|
|
|
2010-04-13 02:37:33 -06:00
|
|
|
static bool force;
|
2009-12-28 17:48:34 -07:00
|
|
|
static bool hide_unresolved;
|
2010-01-05 06:54:45 -07:00
|
|
|
static bool dont_use_callchains;
|
2009-05-26 10:48:58 -06:00
|
|
|
|
2010-04-13 02:37:33 -06:00
|
|
|
static bool show_threads;
|
2009-08-07 05:55:24 -06:00
|
|
|
static struct perf_read_values show_threads_values;
|
|
|
|
|
2010-05-17 13:22:41 -06:00
|
|
|
static const char default_pretty_printing_style[] = "normal";
|
|
|
|
static const char *pretty_printing_style = default_pretty_printing_style;
|
2009-08-10 07:26:32 -06:00
|
|
|
|
2009-07-04 23:39:21 -06:00
|
|
|
static char callchain_default_opt[] = "fractal,0.5";
|
|
|
|
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
static struct hists *perf_session__hists_findnew(struct perf_session *self,
|
|
|
|
u64 event_stream, u32 type,
|
|
|
|
u64 config)
|
2010-03-05 08:51:09 -07:00
|
|
|
{
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
struct rb_node **p = &self->hists_tree.rb_node;
|
2010-03-05 08:51:09 -07:00
|
|
|
struct rb_node *parent = NULL;
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
struct hists *iter, *new;
|
2010-03-05 08:51:09 -07:00
|
|
|
|
|
|
|
while (*p != NULL) {
|
|
|
|
parent = *p;
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
iter = rb_entry(parent, struct hists, rb_node);
|
2010-03-05 08:51:09 -07:00
|
|
|
if (iter->config == config)
|
|
|
|
return iter;
|
|
|
|
|
|
|
|
|
|
|
|
if (config > iter->config)
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
}
|
|
|
|
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
new = malloc(sizeof(struct hists));
|
2010-03-05 08:51:09 -07:00
|
|
|
if (new == NULL)
|
|
|
|
return NULL;
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
memset(new, 0, sizeof(struct hists));
|
2010-03-05 08:51:09 -07:00
|
|
|
new->event_stream = event_stream;
|
|
|
|
new->config = config;
|
|
|
|
new->type = type;
|
|
|
|
rb_link_node(&new->rb_node, parent, p);
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
rb_insert_color(&new->rb_node, &self->hists_tree);
|
2010-03-05 08:51:09 -07:00
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2009-12-14 08:10:39 -07:00
|
|
|
static int perf_session__add_hist_entry(struct perf_session *self,
|
|
|
|
struct addr_location *al,
|
2010-03-05 08:51:09 -07:00
|
|
|
struct sample_data *data)
|
2009-05-18 09:45:42 -06:00
|
|
|
{
|
2010-03-24 13:40:18 -06:00
|
|
|
struct map_symbol *syms = NULL;
|
|
|
|
struct symbol *parent = NULL;
|
2010-05-09 09:01:05 -06:00
|
|
|
int err = -ENOMEM;
|
2009-05-27 12:20:24 -06:00
|
|
|
struct hist_entry *he;
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
struct hists *hists;
|
2010-03-05 08:51:09 -07:00
|
|
|
struct perf_event_attr *attr;
|
2009-05-27 12:20:24 -06:00
|
|
|
|
2010-04-02 07:04:18 -06:00
|
|
|
if ((sort__has_parent || symbol_conf.use_callchain) && data->callchain) {
|
2009-12-14 09:22:59 -07:00
|
|
|
syms = perf_session__resolve_callchain(self, al->thread,
|
2010-03-05 08:51:09 -07:00
|
|
|
data->callchain, &parent);
|
2010-04-02 07:04:18 -06:00
|
|
|
if (syms == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2010-03-05 08:51:09 -07:00
|
|
|
|
|
|
|
attr = perf_header__find_attr(data->id, &self->header);
|
|
|
|
if (attr)
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
hists = perf_session__hists_findnew(self, data->id, attr->type, attr->config);
|
2010-03-05 08:51:09 -07:00
|
|
|
else
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
hists = perf_session__hists_findnew(self, data->id, 0, 0);
|
|
|
|
if (hists == NULL)
|
2010-05-09 09:01:05 -06:00
|
|
|
goto out_free_syms;
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
he = __hists__add_entry(hists, al, parent, data->period);
|
2009-10-03 07:42:45 -06:00
|
|
|
if (he == NULL)
|
2010-05-09 09:01:05 -06:00
|
|
|
goto out_free_syms;
|
|
|
|
err = 0;
|
2010-05-11 20:18:06 -06:00
|
|
|
if (symbol_conf.use_callchain) {
|
2010-07-07 19:41:46 -06:00
|
|
|
err = append_chain(he->callchain, data->callchain, syms, data->period);
|
2010-05-11 20:18:06 -06:00
|
|
|
if (err)
|
|
|
|
goto out_free_syms;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Only in the newt browser we are doing integrated annotation,
|
|
|
|
* so we don't allocated the extra space needed because the stdio
|
|
|
|
* code will not use it.
|
|
|
|
*/
|
perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig
Using the same scheme as for git's/perf's pager setup, i.e. if one
doesn't want to, on a newt enabled perf binary, to disable the TUI for
'perf report', its just a matter of doing:
[root@doppio linux-2.6-tip]# printf "[tui]\n\nreport = off\n" >
/root/.perfconfig
[root@doppio linux-2.6-tip]# cat /root/.perfconfig
[tui]
report = off
[root@doppio linux-2.6-tip]#
System wide settings are also possible, by editing /etc/perfconfig, etc,
i.e. the git machinery for config files applies to perf as well, so when
in doubt where to put your settings, consult the git documentation, if
it fails, please let us know.
Suggested-by: Ingo Molnar <mingo@elte.hu>
Discussed-with: Stephane Eranian <eranian@google.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-20 19:01:10 -06:00
|
|
|
if (use_browser > 0)
|
2010-05-11 20:18:06 -06:00
|
|
|
err = hist_entry__inc_addr_samples(he, al->addr);
|
2010-05-09 09:01:05 -06:00
|
|
|
out_free_syms:
|
|
|
|
free(syms);
|
|
|
|
return err;
|
2009-05-18 09:45:42 -06:00
|
|
|
}
|
|
|
|
|
2010-03-05 08:51:09 -07:00
|
|
|
static int add_event_total(struct perf_session *session,
|
|
|
|
struct sample_data *data,
|
|
|
|
struct perf_event_attr *attr)
|
|
|
|
{
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
struct hists *hists;
|
2010-03-05 08:51:09 -07:00
|
|
|
|
|
|
|
if (attr)
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
hists = perf_session__hists_findnew(session, data->id,
|
|
|
|
attr->type, attr->config);
|
2010-03-05 08:51:09 -07:00
|
|
|
else
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
hists = perf_session__hists_findnew(session, data->id, 0, 0);
|
2010-03-05 08:51:09 -07:00
|
|
|
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
if (!hists)
|
2010-03-05 08:51:09 -07:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2010-05-14 10:16:55 -06:00
|
|
|
hists->stats.total_period += data->period;
|
2010-05-14 07:36:42 -06:00
|
|
|
/*
|
|
|
|
* FIXME: add_event_total should be moved from here to
|
|
|
|
* perf_session__process_event so that the proper hist is passed to
|
|
|
|
* the event_op methods.
|
|
|
|
*/
|
|
|
|
hists__inc_nr_events(hists, PERF_RECORD_SAMPLE);
|
2010-05-14 10:16:55 -06:00
|
|
|
session->hists.stats.total_period += data->period;
|
2010-03-05 08:51:09 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-13 14:50:28 -07:00
|
|
|
static int process_sample_event(event_t *event, struct perf_session *session)
|
2009-06-03 15:14:49 -06:00
|
|
|
{
|
2009-12-15 15:04:41 -07:00
|
|
|
struct sample_data data = { .period = 1, };
|
perf tools: Consolidate symbol resolving across all tools
Now we have a very high level routine for simple tools to
process IP sample events:
int event__preprocess_sample(const event_t *self,
struct addr_location *al,
symbol_filter_t filter)
It receives the event itself and will insert new threads in the
global threads list and resolve the map and symbol, filling all
this info into the new addr_location struct, so that tools like
annotate and report can further process the event by creating
hist_entries in their specific way (with or without callgraphs,
etc).
It in turn uses the new next layer function:
void thread__find_addr_location(struct thread *self, u8 cpumode,
enum map_type type, u64 addr,
struct addr_location *al,
symbol_filter_t filter)
This one will, given a thread (userspace or the kernel kthread
one), will find the given type (MAP__FUNCTION now, MAP__VARIABLE
too in the near future) at the given cpumode, taking vdsos into
account (userspace hit, but kernel symbol) and will fill all
these details in the addr_location given.
Tools that need a more compact API for plain function
resolution, like 'kmem', can use this other one:
struct symbol *thread__find_function(struct thread *self, u64 addr,
symbol_filter_t filter)
So, to resolve a kernel symbol, that is all the 'kmem' tool
needs, its just a matter of calling:
sym = thread__find_function(kthread, addr, NULL);
The 'filter' parameter is needed because we do lazy
parsing/loading of ELF symtabs or /proc/kallsyms.
With this we remove more code duplication all around, which is
always good, huh? :-)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1259346563-12568-12-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-11-27 11:29:23 -07:00
|
|
|
struct addr_location al;
|
2010-03-05 08:51:09 -07:00
|
|
|
struct perf_event_attr *attr;
|
2009-12-06 04:08:24 -07:00
|
|
|
|
2010-06-04 05:02:07 -06:00
|
|
|
if (event__preprocess_sample(event, session, &al, &data, NULL) < 0) {
|
2009-12-15 15:04:41 -07:00
|
|
|
fprintf(stderr, "problem processing %d event, skipping it.\n",
|
2009-06-03 15:14:49 -06:00
|
|
|
event->header.type);
|
|
|
|
return -1;
|
|
|
|
}
|
2009-05-27 12:20:24 -06:00
|
|
|
|
2009-12-28 17:48:34 -07:00
|
|
|
if (al.filtered || (hide_unresolved && al.sym == NULL))
|
2009-10-03 17:30:48 -06:00
|
|
|
return 0;
|
2009-06-30 16:01:22 -06:00
|
|
|
|
2010-03-05 08:51:09 -07:00
|
|
|
if (perf_session__add_hist_entry(session, &al, &data)) {
|
2010-05-14 11:19:35 -06:00
|
|
|
pr_debug("problem incrementing symbol period, skipping event\n");
|
2009-10-03 17:30:48 -06:00
|
|
|
return -1;
|
2009-05-18 09:45:42 -06:00
|
|
|
}
|
2009-10-03 17:30:48 -06:00
|
|
|
|
2010-03-05 08:51:09 -07:00
|
|
|
attr = perf_header__find_attr(data.id, &session->header);
|
|
|
|
|
|
|
|
if (add_event_total(session, &data, attr)) {
|
2010-05-14 11:19:35 -06:00
|
|
|
pr_debug("problem adding event period\n");
|
2010-03-05 08:51:09 -07:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-06-03 15:14:49 -06:00
|
|
|
return 0;
|
|
|
|
}
|
2009-06-03 01:38:58 -06:00
|
|
|
|
2009-12-13 14:50:24 -07:00
|
|
|
static int process_read_event(event_t *event, struct perf_session *session __used)
|
2009-06-24 14:46:04 -06:00
|
|
|
{
|
perf: Do the big rename: Performance Counters -> Performance Events
Bye-bye Performance Counters, welcome Performance Events!
In the past few months the perfcounters subsystem has grown out its
initial role of counting hardware events, and has become (and is
becoming) a much broader generic event enumeration, reporting, logging,
monitoring, analysis facility.
Naming its core object 'perf_counter' and naming the subsystem
'perfcounters' has become more and more of a misnomer. With pending
code like hw-breakpoints support the 'counter' name is less and
less appropriate.
All in one, we've decided to rename the subsystem to 'performance
events' and to propagate this rename through all fields, variables
and API names. (in an ABI compatible fashion)
The word 'event' is also a bit shorter than 'counter' - which makes
it slightly more convenient to write/handle as well.
Thanks goes to Stephane Eranian who first observed this misnomer and
suggested a rename.
User-space tooling and ABI compatibility is not affected - this patch
should be function-invariant. (Also, defconfigs were not touched to
keep the size down.)
This patch has been generated via the following script:
FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
sed -i \
-e 's/PERF_EVENT_/PERF_RECORD_/g' \
-e 's/PERF_COUNTER/PERF_EVENT/g' \
-e 's/perf_counter/perf_event/g' \
-e 's/nb_counters/nb_events/g' \
-e 's/swcounter/swevent/g' \
-e 's/tpcounter_event/tp_event/g' \
$FILES
for N in $(find . -name perf_counter.[ch]); do
M=$(echo $N | sed 's/perf_counter/perf_event/g')
mv $N $M
done
FILES=$(find . -name perf_event.*)
sed -i \
-e 's/COUNTER_MASK/REG_MASK/g' \
-e 's/COUNTER/EVENT/g' \
-e 's/\<event\>/event_id/g' \
-e 's/counter/event/g' \
-e 's/Counter/Event/g' \
$FILES
... to keep it as correct as possible. This script can also be
used by anyone who has pending perfcounters patches - it converts
a Linux kernel tree over to the new naming. We tried to time this
change to the point in time where the amount of pending patches
is the smallest: the end of the merge window.
Namespace clashes were fixed up in a preparatory patch - and some
stylistic fallout will be fixed up in a subsequent patch.
( NOTE: 'counters' are still the proper terminology when we deal
with hardware registers - and these sed scripts are a bit
over-eager in renaming them. I've undone some of that, but
in case there's something left where 'counter' would be
better than 'event' we can undo that on an individual basis
instead of touching an otherwise nicely automated patch. )
Suggested-by: Stephane Eranian <eranian@google.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <linux-arch@vger.kernel.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-09-21 04:02:48 -06:00
|
|
|
struct perf_event_attr *attr;
|
2009-08-16 12:56:37 -06:00
|
|
|
|
2009-12-11 16:24:02 -07:00
|
|
|
attr = perf_header__find_attr(event->read.id, &session->header);
|
2009-08-06 11:40:28 -06:00
|
|
|
|
2009-08-07 05:55:24 -06:00
|
|
|
if (show_threads) {
|
2009-08-15 04:26:57 -06:00
|
|
|
const char *name = attr ? __event_name(attr->type, attr->config)
|
2009-08-07 05:55:24 -06:00
|
|
|
: "unknown";
|
|
|
|
perf_read_values_add_value(&show_threads_values,
|
|
|
|
event->read.pid, event->read.tid,
|
|
|
|
event->read.id,
|
|
|
|
name,
|
|
|
|
event->read.value);
|
|
|
|
}
|
|
|
|
|
2009-11-27 11:29:22 -07:00
|
|
|
dump_printf(": %d %d %s %Lu\n", event->read.pid, event->read.tid,
|
|
|
|
attr ? __event_name(attr->type, attr->config) : "FAIL",
|
|
|
|
event->read.value);
|
2009-06-24 14:46:04 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-27 16:37:02 -07:00
|
|
|
static int perf_session__setup_sample_type(struct perf_session *self)
|
2009-06-03 15:14:49 -06:00
|
|
|
{
|
2009-12-27 16:37:02 -07:00
|
|
|
if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
|
2009-07-04 23:39:17 -06:00
|
|
|
if (sort__has_parent) {
|
|
|
|
fprintf(stderr, "selected --sort parent, but no"
|
|
|
|
" callchain data. Did you call"
|
|
|
|
" perf record without -g?\n");
|
2009-12-27 16:37:02 -07:00
|
|
|
return -EINVAL;
|
2009-07-04 23:39:17 -06:00
|
|
|
}
|
2009-12-15 15:04:42 -07:00
|
|
|
if (symbol_conf.use_callchain) {
|
2009-08-17 15:07:48 -06:00
|
|
|
fprintf(stderr, "selected -g but no callchain data."
|
2009-07-04 23:39:17 -06:00
|
|
|
" Did you call perf record without"
|
|
|
|
" -g?\n");
|
2009-10-07 04:47:31 -06:00
|
|
|
return -1;
|
2009-07-04 23:39:17 -06:00
|
|
|
}
|
2010-01-05 06:54:45 -07:00
|
|
|
} else if (!dont_use_callchains && callchain_param.mode != CHAIN_NONE &&
|
|
|
|
!symbol_conf.use_callchain) {
|
2009-12-15 15:04:42 -07:00
|
|
|
symbol_conf.use_callchain = true;
|
2009-08-07 18:16:24 -06:00
|
|
|
if (register_callchain_param(&callchain_param) < 0) {
|
|
|
|
fprintf(stderr, "Can't register callchain"
|
|
|
|
" params\n");
|
2009-12-27 16:37:02 -07:00
|
|
|
return -EINVAL;
|
2009-08-07 18:16:24 -06:00
|
|
|
}
|
2009-06-18 15:22:55 -06:00
|
|
|
}
|
|
|
|
|
2009-10-07 04:47:31 -06:00
|
|
|
return 0;
|
|
|
|
}
|
2009-05-26 12:51:47 -06:00
|
|
|
|
2009-12-13 14:50:25 -07:00
|
|
|
static struct perf_event_ops event_ops = {
|
2009-12-27 16:37:05 -07:00
|
|
|
.sample = process_sample_event,
|
|
|
|
.mmap = event__process_mmap,
|
|
|
|
.comm = event__process_comm,
|
|
|
|
.exit = event__process_task,
|
|
|
|
.fork = event__process_task,
|
|
|
|
.lost = event__process_lost,
|
|
|
|
.read = process_read_event,
|
2010-04-01 22:59:19 -06:00
|
|
|
.attr = event__process_attr,
|
2010-04-01 22:59:20 -06:00
|
|
|
.event_type = event__process_event_type,
|
2010-04-01 22:59:21 -06:00
|
|
|
.tracing_data = event__process_tracing_data,
|
2010-04-01 22:59:22 -06:00
|
|
|
.build_id = event__process_build_id,
|
2009-10-07 04:47:31 -06:00
|
|
|
};
|
2009-05-26 12:51:47 -06:00
|
|
|
|
2010-04-01 22:59:17 -06:00
|
|
|
extern volatile int session_done;
|
|
|
|
|
2010-05-14 11:19:35 -06:00
|
|
|
static void sig_handler(int sig __used)
|
2010-04-01 22:59:17 -06:00
|
|
|
{
|
|
|
|
session_done = 1;
|
|
|
|
}
|
|
|
|
|
2010-05-14 11:19:35 -06:00
|
|
|
static size_t hists__fprintf_nr_sample_events(struct hists *self,
|
|
|
|
const char *evname, FILE *fp)
|
|
|
|
{
|
|
|
|
size_t ret;
|
|
|
|
char unit;
|
|
|
|
unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE];
|
|
|
|
|
|
|
|
nr_events = convert_unit(nr_events, &unit);
|
|
|
|
ret = fprintf(fp, "# Events: %lu%c", nr_events, unit);
|
|
|
|
if (evname != NULL)
|
|
|
|
ret += fprintf(fp, " %s", evname);
|
|
|
|
return ret + fprintf(fp, "\n#\n");
|
|
|
|
}
|
|
|
|
|
2010-05-23 19:36:51 -06:00
|
|
|
static int hists__tty_browse_tree(struct rb_root *tree, const char *help)
|
|
|
|
{
|
|
|
|
struct rb_node *next = rb_first(tree);
|
|
|
|
|
|
|
|
while (next) {
|
|
|
|
struct hists *hists = rb_entry(next, struct hists, rb_node);
|
|
|
|
const char *evname = NULL;
|
|
|
|
|
|
|
|
if (rb_first(&hists->entries) != rb_last(&hists->entries))
|
|
|
|
evname = __event_name(hists->type, hists->config);
|
|
|
|
|
|
|
|
hists__fprintf_nr_sample_events(hists, evname, stdout);
|
|
|
|
hists__fprintf(hists, NULL, false, stdout);
|
|
|
|
fprintf(stdout, "\n\n");
|
|
|
|
next = rb_next(&hists->rb_node);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sort_order == default_sort_order &&
|
|
|
|
parent_pattern == default_parent_pattern) {
|
|
|
|
fprintf(stdout, "#\n# (%s)\n#\n", help);
|
|
|
|
|
|
|
|
if (show_threads) {
|
|
|
|
bool style = !strcmp(pretty_printing_style, "raw");
|
|
|
|
perf_read_values_display(stdout, &show_threads_values,
|
|
|
|
style);
|
|
|
|
perf_read_values_destroy(&show_threads_values);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-10-07 04:47:31 -06:00
|
|
|
static int __cmd_report(void)
|
|
|
|
{
|
2009-12-27 16:37:02 -07:00
|
|
|
int ret = -EINVAL;
|
2009-12-13 14:50:24 -07:00
|
|
|
struct perf_session *session;
|
2010-03-05 08:51:09 -07:00
|
|
|
struct rb_node *next;
|
2010-03-11 16:12:44 -07:00
|
|
|
const char *help = "For a higher level overview, try: perf report --sort comm,dso";
|
2009-05-18 09:45:42 -06:00
|
|
|
|
2010-04-01 22:59:17 -06:00
|
|
|
signal(SIGINT, sig_handler);
|
|
|
|
|
2010-05-01 00:41:20 -06:00
|
|
|
session = perf_session__new(input_name, O_RDONLY, force, false);
|
2009-12-11 16:24:02 -07:00
|
|
|
if (session == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-10-07 04:47:31 -06:00
|
|
|
if (show_threads)
|
|
|
|
perf_read_values_init(&show_threads_values);
|
2009-06-18 15:22:55 -06:00
|
|
|
|
2009-12-27 16:37:02 -07:00
|
|
|
ret = perf_session__setup_sample_type(session);
|
|
|
|
if (ret)
|
|
|
|
goto out_delete;
|
|
|
|
|
2009-12-13 14:50:27 -07:00
|
|
|
ret = perf_session__process_events(session, &event_ops);
|
2009-10-07 04:47:31 -06:00
|
|
|
if (ret)
|
2009-12-11 16:24:02 -07:00
|
|
|
goto out_delete;
|
2009-05-26 10:48:58 -06:00
|
|
|
|
2009-11-27 11:29:22 -07:00
|
|
|
if (dump_trace) {
|
2010-05-14 07:36:42 -06:00
|
|
|
perf_session__fprintf_nr_events(session, stdout);
|
2009-12-11 16:24:02 -07:00
|
|
|
goto out_delete;
|
2009-11-27 11:29:22 -07:00
|
|
|
}
|
2009-05-26 10:48:58 -06:00
|
|
|
|
2009-10-07 07:49:00 -06:00
|
|
|
if (verbose > 3)
|
2009-12-13 14:50:28 -07:00
|
|
|
perf_session__fprintf(session, stdout);
|
2009-06-04 10:54:00 -06:00
|
|
|
|
2009-10-07 07:49:00 -06:00
|
|
|
if (verbose > 2)
|
2010-04-27 18:22:44 -06:00
|
|
|
perf_session__fprintf_dsos(session, stdout);
|
2009-05-27 01:10:38 -06:00
|
|
|
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
next = rb_first(&session->hists_tree);
|
2010-03-05 08:51:09 -07:00
|
|
|
while (next) {
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
struct hists *hists;
|
2010-03-05 08:51:09 -07:00
|
|
|
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
hists = rb_entry(next, struct hists, rb_node);
|
|
|
|
hists__collapse_resort(hists);
|
2010-05-10 10:57:51 -06:00
|
|
|
hists__output_resort(hists);
|
perf hist: Introduce hists class and move lots of methods to it
In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.
While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.
Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.
The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.
Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-10 10:04:11 -06:00
|
|
|
next = rb_next(&hists->rb_node);
|
2010-03-05 08:51:09 -07:00
|
|
|
}
|
|
|
|
|
2010-05-23 19:36:51 -06:00
|
|
|
if (use_browser > 0)
|
|
|
|
hists__tui_browse_tree(&session->hists_tree, help);
|
|
|
|
else
|
|
|
|
hists__tty_browse_tree(&session->hists_tree, help);
|
2009-12-16 07:27:10 -07:00
|
|
|
|
2009-12-11 16:24:02 -07:00
|
|
|
out_delete:
|
|
|
|
perf_session__delete(session);
|
2009-10-07 04:47:31 -06:00
|
|
|
return ret;
|
2009-05-18 09:45:42 -06:00
|
|
|
}
|
|
|
|
|
2009-07-02 09:58:21 -06:00
|
|
|
static int
|
|
|
|
parse_callchain_opt(const struct option *opt __used, const char *arg,
|
2010-01-05 06:54:45 -07:00
|
|
|
int unset)
|
2009-07-02 09:58:21 -06:00
|
|
|
{
|
2010-05-09 17:28:10 -06:00
|
|
|
char *tok, *tok2;
|
2009-07-02 12:14:33 -06:00
|
|
|
char *endptr;
|
|
|
|
|
2010-01-05 06:54:45 -07:00
|
|
|
/*
|
|
|
|
* --no-call-graph
|
|
|
|
*/
|
|
|
|
if (unset) {
|
|
|
|
dont_use_callchains = true;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-15 15:04:42 -07:00
|
|
|
symbol_conf.use_callchain = true;
|
2009-07-02 09:58:21 -06:00
|
|
|
|
|
|
|
if (!arg)
|
|
|
|
return 0;
|
|
|
|
|
2009-07-02 12:14:33 -06:00
|
|
|
tok = strtok((char *)arg, ",");
|
|
|
|
if (!tok)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* get the output mode */
|
|
|
|
if (!strncmp(tok, "graph", strlen(arg)))
|
2009-07-04 23:39:21 -06:00
|
|
|
callchain_param.mode = CHAIN_GRAPH_ABS;
|
2009-07-02 09:58:21 -06:00
|
|
|
|
2009-07-02 12:14:33 -06:00
|
|
|
else if (!strncmp(tok, "flat", strlen(arg)))
|
2009-07-04 23:39:21 -06:00
|
|
|
callchain_param.mode = CHAIN_FLAT;
|
|
|
|
|
|
|
|
else if (!strncmp(tok, "fractal", strlen(arg)))
|
|
|
|
callchain_param.mode = CHAIN_GRAPH_REL;
|
|
|
|
|
2009-08-07 18:16:24 -06:00
|
|
|
else if (!strncmp(tok, "none", strlen(arg))) {
|
|
|
|
callchain_param.mode = CHAIN_NONE;
|
2010-01-21 18:47:50 -07:00
|
|
|
symbol_conf.use_callchain = false;
|
2009-08-07 18:16:24 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-02 09:58:21 -06:00
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
2009-07-02 12:14:33 -06:00
|
|
|
/* get the min percentage */
|
|
|
|
tok = strtok(NULL, ",");
|
|
|
|
if (!tok)
|
2009-07-04 23:39:21 -06:00
|
|
|
goto setup;
|
2009-07-02 12:14:33 -06:00
|
|
|
|
2010-05-09 17:28:10 -06:00
|
|
|
tok2 = strtok(NULL, ",");
|
2009-07-04 23:39:21 -06:00
|
|
|
callchain_param.min_percent = strtod(tok, &endptr);
|
2009-07-02 12:14:33 -06:00
|
|
|
if (tok == endptr)
|
|
|
|
return -1;
|
|
|
|
|
2010-05-09 17:28:10 -06:00
|
|
|
if (tok2)
|
|
|
|
callchain_param.print_limit = strtod(tok2, &endptr);
|
2009-07-04 23:39:21 -06:00
|
|
|
setup:
|
|
|
|
if (register_callchain_param(&callchain_param) < 0) {
|
|
|
|
fprintf(stderr, "Can't register callchain params\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2009-07-02 09:58:21 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-18 11:35:58 -07:00
|
|
|
static const char * const report_usage[] = {
|
2009-05-26 01:17:18 -06:00
|
|
|
"perf report [<options>] <command>",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct option options[] = {
|
|
|
|
OPT_STRING('i', "input", &input_name, "file",
|
|
|
|
"input file name"),
|
2010-04-13 02:37:33 -06:00
|
|
|
OPT_INCR('v', "verbose", &verbose,
|
2009-05-26 16:46:14 -06:00
|
|
|
"be more verbose (show symbol address, etc)"),
|
2009-05-26 10:48:58 -06:00
|
|
|
OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
|
|
|
|
"dump raw trace in ASCII"),
|
2009-11-24 07:05:15 -07:00
|
|
|
OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
|
|
|
|
"file", "vmlinux pathname"),
|
2009-08-19 03:18:26 -06:00
|
|
|
OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
|
2009-11-24 07:05:15 -07:00
|
|
|
OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
|
2009-07-02 00:09:46 -06:00
|
|
|
"load module symbols - WARNING: use only with -k and LIVE kernel"),
|
2009-12-15 15:04:42 -07:00
|
|
|
OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
|
2009-07-11 09:18:37 -06:00
|
|
|
"Show a column with the number of samples"),
|
2009-08-07 05:55:24 -06:00
|
|
|
OPT_BOOLEAN('T', "threads", &show_threads,
|
|
|
|
"Show per-thread event counters"),
|
2009-08-10 07:26:32 -06:00
|
|
|
OPT_STRING(0, "pretty", &pretty_printing_style, "key",
|
|
|
|
"pretty printing style key: normal raw"),
|
2009-05-28 02:52:00 -06:00
|
|
|
OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
|
2009-06-17 23:01:03 -06:00
|
|
|
"sort by key(s): pid, comm, dso, symbol, parent"),
|
2010-04-18 23:32:50 -06:00
|
|
|
OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
|
|
|
|
"Show sample percentage for different cpu modes"),
|
2009-06-17 23:01:03 -06:00
|
|
|
OPT_STRING('p', "parent", &parent_pattern, "regex",
|
|
|
|
"regex filter to identify parent, see: '--sort parent'"),
|
2009-12-15 15:04:42 -07:00
|
|
|
OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,
|
2009-06-18 06:32:19 -06:00
|
|
|
"Only display entries with parent-match"),
|
2009-07-16 07:44:29 -06:00
|
|
|
OPT_CALLBACK_DEFAULT('g', "call-graph", NULL, "output_type,min_percent",
|
2010-05-08 09:33:03 -06:00
|
|
|
"Display callchains using output_type (graph, flat, fractal, or none) and min percent threshold. "
|
2009-07-16 07:44:29 -06:00
|
|
|
"Default: fractal,0.5", &parse_callchain_opt, callchain_default_opt),
|
2009-12-15 15:04:40 -07:00
|
|
|
OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
|
2009-06-30 16:01:20 -06:00
|
|
|
"only consider symbols in these dsos"),
|
2009-12-15 15:04:40 -07:00
|
|
|
OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
|
2009-06-30 16:01:21 -06:00
|
|
|
"only consider symbols in these comms"),
|
2009-12-15 15:04:40 -07:00
|
|
|
OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
|
2009-06-30 16:01:22 -06:00
|
|
|
"only consider these symbols"),
|
2009-12-15 15:04:40 -07:00
|
|
|
OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str,
|
2009-07-10 19:47:28 -06:00
|
|
|
"width[,width...]",
|
|
|
|
"don't try to adjust column width, use these fixed values"),
|
2009-12-15 15:04:41 -07:00
|
|
|
OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator",
|
2009-07-10 19:47:28 -06:00
|
|
|
"separator for columns, no spaces will be added between "
|
|
|
|
"columns '.' is reserved."),
|
2009-12-28 17:48:34 -07:00
|
|
|
OPT_BOOLEAN('U', "hide-unresolved", &hide_unresolved,
|
|
|
|
"Only display entries resolved to a symbol"),
|
2009-05-26 01:17:18 -06:00
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
2009-07-01 04:37:06 -06:00
|
|
|
int cmd_report(int argc, const char **argv, const char *prefix __used)
|
2009-05-26 01:17:18 -06:00
|
|
|
{
|
2009-12-15 15:04:40 -07:00
|
|
|
argc = parse_options(argc, argv, options, report_usage, 0);
|
|
|
|
|
2010-04-01 22:59:17 -06:00
|
|
|
if (strcmp(input_name, "-") != 0)
|
|
|
|
setup_browser();
|
2010-05-11 20:18:06 -06:00
|
|
|
/*
|
|
|
|
* Only in the newt browser we are doing integrated annotation,
|
|
|
|
* so don't allocate extra space that won't be used in the stdio
|
|
|
|
* implementation.
|
|
|
|
*/
|
perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig
Using the same scheme as for git's/perf's pager setup, i.e. if one
doesn't want to, on a newt enabled perf binary, to disable the TUI for
'perf report', its just a matter of doing:
[root@doppio linux-2.6-tip]# printf "[tui]\n\nreport = off\n" >
/root/.perfconfig
[root@doppio linux-2.6-tip]# cat /root/.perfconfig
[tui]
report = off
[root@doppio linux-2.6-tip]#
System wide settings are also possible, by editing /etc/perfconfig, etc,
i.e. the git machinery for config files applies to perf as well, so when
in doubt where to put your settings, consult the git documentation, if
it fails, please let us know.
Suggested-by: Ingo Molnar <mingo@elte.hu>
Discussed-with: Stephane Eranian <eranian@google.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-05-20 19:01:10 -06:00
|
|
|
if (use_browser > 0)
|
2010-05-11 20:18:06 -06:00
|
|
|
symbol_conf.priv_size = sizeof(struct sym_priv);
|
2009-12-15 15:04:40 -07:00
|
|
|
|
2009-12-15 15:04:39 -07:00
|
|
|
if (symbol__init() < 0)
|
2009-11-24 07:05:15 -07:00
|
|
|
return -1;
|
2009-05-26 01:17:18 -06:00
|
|
|
|
2009-12-14 15:09:29 -07:00
|
|
|
setup_sorting(report_usage, options);
|
2009-05-27 12:20:25 -06:00
|
|
|
|
2009-07-11 09:18:35 -06:00
|
|
|
if (parent_pattern != default_parent_pattern) {
|
2010-04-02 09:30:57 -06:00
|
|
|
if (sort_dimension__add("parent") < 0)
|
|
|
|
return -1;
|
2009-07-11 09:18:35 -06:00
|
|
|
sort_parent.elide = 1;
|
|
|
|
} else
|
2009-12-15 15:04:42 -07:00
|
|
|
symbol_conf.exclude_other = false;
|
2009-06-18 06:32:19 -06:00
|
|
|
|
2009-06-04 08:24:37 -06:00
|
|
|
/*
|
|
|
|
* Any (unrecognized) arguments left?
|
|
|
|
*/
|
|
|
|
if (argc)
|
|
|
|
usage_with_options(report_usage, options);
|
|
|
|
|
2009-12-15 15:04:40 -07:00
|
|
|
sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);
|
|
|
|
sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);
|
|
|
|
sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);
|
2009-06-30 16:01:20 -06:00
|
|
|
|
2009-05-26 01:17:18 -06:00
|
|
|
return __cmd_report();
|
|
|
|
}
|