f0c55bcf4a
This patch changes the way perf stat prints event names at the end of a
run. Until now, it was trying to reconstruct the event name from its
encoding. The problem is that it would only print generic events without
their modifiers (u, k, pp).
This patch saves the event name as passed by the user in the evsel
struct and uses it to print the final event name.
This would also work in case perf is linked with a library (such as
libpfm4) which provides full PMU event tables.
$ perf stat -e cycles:u,cycles:k date
Wed Feb 16 14:58:52 CET 2011
Performance counter stats for 'date':
568600 cycles:u
2779715 cycles:k
0.001908182 seconds time elapsed
Cc: Arun Sharma <arun@sharma-home.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@gmail.com>
LPU-Reference: <4d5bdc64.98a1df0a.7aa3.06c2@mx.google.com>
Signed-off-by: Stephane Eranian <eranian@google.com>
[ committer note: Fixed a merge problem with 023695d "Add cgroup support" ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
146 lines
4.0 KiB
C
146 lines
4.0 KiB
C
#ifndef __PERF_EVSEL_H
|
|
#define __PERF_EVSEL_H 1
|
|
|
|
#include <linux/list.h>
|
|
#include <stdbool.h>
|
|
#include "../../../include/linux/perf_event.h"
|
|
#include "types.h"
|
|
#include "xyarray.h"
|
|
#include "cgroup.h"
|
|
|
|
struct perf_counts_values {
|
|
union {
|
|
struct {
|
|
u64 val;
|
|
u64 ena;
|
|
u64 run;
|
|
};
|
|
u64 values[3];
|
|
};
|
|
};
|
|
|
|
struct perf_counts {
|
|
s8 scaled;
|
|
struct perf_counts_values aggr;
|
|
struct perf_counts_values cpu[];
|
|
};
|
|
|
|
struct perf_evsel;
|
|
|
|
/*
|
|
* Per fd, to map back from PERF_SAMPLE_ID to evsel, only used when there are
|
|
* more than one entry in the evlist.
|
|
*/
|
|
struct perf_sample_id {
|
|
struct hlist_node node;
|
|
u64 id;
|
|
struct perf_evsel *evsel;
|
|
};
|
|
|
|
/** struct perf_evsel - event selector
|
|
*
|
|
* @name - Can be set to retain the original event name passed by the user,
|
|
* so that when showing results in tools such as 'perf stat', we
|
|
* show the name used, not some alias.
|
|
*/
|
|
struct perf_evsel {
|
|
struct list_head node;
|
|
struct perf_event_attr attr;
|
|
char *filter;
|
|
struct xyarray *fd;
|
|
struct xyarray *id;
|
|
struct perf_counts *counts;
|
|
int idx;
|
|
char *name;
|
|
void *priv;
|
|
struct cgroup_sel *cgrp;
|
|
};
|
|
|
|
struct cpu_map;
|
|
struct thread_map;
|
|
struct perf_evlist;
|
|
|
|
struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx);
|
|
void perf_evsel__init(struct perf_evsel *evsel,
|
|
struct perf_event_attr *attr, int idx);
|
|
void perf_evsel__exit(struct perf_evsel *evsel);
|
|
void perf_evsel__delete(struct perf_evsel *evsel);
|
|
|
|
int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);
|
|
int perf_evsel__alloc_id(struct perf_evsel *evsel, int ncpus, int nthreads);
|
|
int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus);
|
|
void perf_evsel__free_fd(struct perf_evsel *evsel);
|
|
void perf_evsel__free_id(struct perf_evsel *evsel);
|
|
void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads);
|
|
|
|
int perf_evsel__open_per_cpu(struct perf_evsel *evsel,
|
|
struct cpu_map *cpus, bool group, bool inherit);
|
|
int perf_evsel__open_per_thread(struct perf_evsel *evsel,
|
|
struct thread_map *threads, bool group, bool inherit);
|
|
int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
|
struct thread_map *threads, bool group, bool inherit);
|
|
|
|
#define perf_evsel__match(evsel, t, c) \
|
|
(evsel->attr.type == PERF_TYPE_##t && \
|
|
evsel->attr.config == PERF_COUNT_##c)
|
|
|
|
int __perf_evsel__read_on_cpu(struct perf_evsel *evsel,
|
|
int cpu, int thread, bool scale);
|
|
|
|
/**
|
|
* perf_evsel__read_on_cpu - Read out the results on a CPU and thread
|
|
*
|
|
* @evsel - event selector to read value
|
|
* @cpu - CPU of interest
|
|
* @thread - thread of interest
|
|
*/
|
|
static inline int perf_evsel__read_on_cpu(struct perf_evsel *evsel,
|
|
int cpu, int thread)
|
|
{
|
|
return __perf_evsel__read_on_cpu(evsel, cpu, thread, false);
|
|
}
|
|
|
|
/**
|
|
* perf_evsel__read_on_cpu_scaled - Read out the results on a CPU and thread, scaled
|
|
*
|
|
* @evsel - event selector to read value
|
|
* @cpu - CPU of interest
|
|
* @thread - thread of interest
|
|
*/
|
|
static inline int perf_evsel__read_on_cpu_scaled(struct perf_evsel *evsel,
|
|
int cpu, int thread)
|
|
{
|
|
return __perf_evsel__read_on_cpu(evsel, cpu, thread, true);
|
|
}
|
|
|
|
int __perf_evsel__read(struct perf_evsel *evsel, int ncpus, int nthreads,
|
|
bool scale);
|
|
|
|
/**
|
|
* perf_evsel__read - Read the aggregate results on all CPUs
|
|
*
|
|
* @evsel - event selector to read value
|
|
* @ncpus - Number of cpus affected, from zero
|
|
* @nthreads - Number of threads affected, from zero
|
|
*/
|
|
static inline int perf_evsel__read(struct perf_evsel *evsel,
|
|
int ncpus, int nthreads)
|
|
{
|
|
return __perf_evsel__read(evsel, ncpus, nthreads, false);
|
|
}
|
|
|
|
/**
|
|
* perf_evsel__read_scaled - Read the aggregate results on all CPUs, scaled
|
|
*
|
|
* @evsel - event selector to read value
|
|
* @ncpus - Number of cpus affected, from zero
|
|
* @nthreads - Number of threads affected, from zero
|
|
*/
|
|
static inline int perf_evsel__read_scaled(struct perf_evsel *evsel,
|
|
int ncpus, int nthreads)
|
|
{
|
|
return __perf_evsel__read(evsel, ncpus, nthreads, true);
|
|
}
|
|
|
|
#endif /* __PERF_EVSEL_H */
|