56722381b8
Fixes two more cases where the python binding would not load: . Not finding die(), which it shouldn't anyway, not good to just stop the world because some particular perf.data file is invalid, just propagate the error to the caller. . Not finding perf_sample_size: fix it by moving it from event.c to evsel, where it belongs, as most cases are moving to operate on an evsel object.o One of the fixed problems: [root@emilia ~]# python >>> import perf Traceback (most recent call last): File "<stdin>", line 1, in <module> ImportError: /home/acme/git/build/perf/python/perf.so: undefined symbol: perf_sample_size >>> [root@emilia ~]# Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-1hkj7b2cvgbfnoizsekjb6c9@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
161 lines
4.2 KiB
C
161 lines
4.2 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"
|
|
#include "hist.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 *sample_id;
|
|
u64 *id;
|
|
struct perf_counts *counts;
|
|
int idx;
|
|
int ids;
|
|
struct hists hists;
|
|
char *name;
|
|
union {
|
|
void *priv;
|
|
off_t id_offset;
|
|
};
|
|
struct cgroup_sel *cgrp;
|
|
bool supported;
|
|
};
|
|
|
|
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);
|
|
int perf_evsel__open_per_thread(struct perf_evsel *evsel,
|
|
struct thread_map *threads, bool group);
|
|
int perf_evsel__open(struct perf_evsel *evsel, struct cpu_map *cpus,
|
|
struct thread_map *threads, bool group);
|
|
|
|
#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);
|
|
}
|
|
|
|
int __perf_evsel__sample_size(u64 sample_type);
|
|
|
|
static inline int perf_evsel__sample_size(struct perf_evsel *evsel)
|
|
{
|
|
return __perf_evsel__sample_size(evsel->attr.sample_type);
|
|
}
|
|
|
|
#endif /* __PERF_EVSEL_H */
|