perf evsel: Rename struct perf_evsel to struct evsel
Rename struct perf_evsel to struct evsel, so we don't have a name clash when we add struct perf_evsel in libperf. Committer notes: Added fixes for arm64, provided by Jiri. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Budankov <alexey.budankov@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20190721112506.12306-5-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
9749b90e56
commit
32dcd021d0
@@ -2187,7 +2187,7 @@ struct hist_browser *hist_browser__new(struct hists *hists)
|
||||
}
|
||||
|
||||
static struct hist_browser *
|
||||
perf_evsel_browser__new(struct perf_evsel *evsel,
|
||||
perf_evsel_browser__new(struct evsel *evsel,
|
||||
struct hist_browser_timer *hbt,
|
||||
struct perf_env *env,
|
||||
struct annotation_options *annotation_opts)
|
||||
@@ -2352,7 +2352,7 @@ struct popup_action {
|
||||
struct thread *thread;
|
||||
struct map_symbol ms;
|
||||
int socket;
|
||||
struct perf_evsel *evsel;
|
||||
struct evsel *evsel;
|
||||
enum rstype rstype;
|
||||
|
||||
int (*fn)(struct hist_browser *browser, struct popup_action *act);
|
||||
@@ -2361,7 +2361,7 @@ struct popup_action {
|
||||
static int
|
||||
do_annotate(struct hist_browser *browser, struct popup_action *act)
|
||||
{
|
||||
struct perf_evsel *evsel;
|
||||
struct evsel *evsel;
|
||||
struct annotation *notes;
|
||||
struct hist_entry *he;
|
||||
int err;
|
||||
@@ -2596,7 +2596,7 @@ static int
|
||||
add_script_opt_2(struct hist_browser *browser __maybe_unused,
|
||||
struct popup_action *act, char **optstr,
|
||||
struct thread *thread, struct symbol *sym,
|
||||
struct perf_evsel *evsel, const char *tstr)
|
||||
struct evsel *evsel, const char *tstr)
|
||||
{
|
||||
|
||||
if (thread) {
|
||||
@@ -2623,7 +2623,7 @@ static int
|
||||
add_script_opt(struct hist_browser *browser,
|
||||
struct popup_action *act, char **optstr,
|
||||
struct thread *thread, struct symbol *sym,
|
||||
struct perf_evsel *evsel)
|
||||
struct evsel *evsel)
|
||||
{
|
||||
int n, j;
|
||||
struct hist_entry *he;
|
||||
@@ -2653,7 +2653,7 @@ static int
|
||||
add_res_sample_opt(struct hist_browser *browser __maybe_unused,
|
||||
struct popup_action *act, char **optstr,
|
||||
struct res_sample *res_sample,
|
||||
struct perf_evsel *evsel,
|
||||
struct evsel *evsel,
|
||||
enum rstype type)
|
||||
{
|
||||
if (!res_sample)
|
||||
@@ -2814,7 +2814,7 @@ next:
|
||||
}
|
||||
}
|
||||
|
||||
static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
|
||||
static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events,
|
||||
const char *helpline,
|
||||
bool left_exits,
|
||||
struct hist_browser_timer *hbt,
|
||||
@@ -3198,9 +3198,9 @@ out:
|
||||
return key;
|
||||
}
|
||||
|
||||
struct perf_evsel_menu {
|
||||
struct evsel_menu {
|
||||
struct ui_browser b;
|
||||
struct perf_evsel *selection;
|
||||
struct evsel *selection;
|
||||
struct annotation_options *annotation_opts;
|
||||
bool lost_events, lost_events_warned;
|
||||
float min_pcnt;
|
||||
@@ -3210,9 +3210,9 @@ struct perf_evsel_menu {
|
||||
static void perf_evsel_menu__write(struct ui_browser *browser,
|
||||
void *entry, int row)
|
||||
{
|
||||
struct perf_evsel_menu *menu = container_of(browser,
|
||||
struct perf_evsel_menu, b);
|
||||
struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node);
|
||||
struct evsel_menu *menu = container_of(browser,
|
||||
struct evsel_menu, b);
|
||||
struct evsel *evsel = list_entry(entry, struct evsel, node);
|
||||
struct hists *hists = evsel__hists(evsel);
|
||||
bool current_entry = ui_browser__is_current_entry(browser, row);
|
||||
unsigned long nr_events = hists->stats.nr_events[PERF_RECORD_SAMPLE];
|
||||
@@ -3225,7 +3225,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
|
||||
HE_COLORSET_NORMAL);
|
||||
|
||||
if (perf_evsel__is_group_event(evsel)) {
|
||||
struct perf_evsel *pos;
|
||||
struct evsel *pos;
|
||||
|
||||
ev_name = perf_evsel__group_name(evsel);
|
||||
|
||||
@@ -3257,13 +3257,13 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
|
||||
menu->selection = evsel;
|
||||
}
|
||||
|
||||
static int perf_evsel_menu__run(struct perf_evsel_menu *menu,
|
||||
static int perf_evsel_menu__run(struct evsel_menu *menu,
|
||||
int nr_events, const char *help,
|
||||
struct hist_browser_timer *hbt,
|
||||
bool warn_lost_event)
|
||||
{
|
||||
struct perf_evlist *evlist = menu->b.priv;
|
||||
struct perf_evsel *pos;
|
||||
struct evsel *pos;
|
||||
const char *title = "Available samples";
|
||||
int delay_secs = hbt ? hbt->refresh : 0;
|
||||
int key;
|
||||
@@ -3351,7 +3351,7 @@ out:
|
||||
static bool filter_group_entries(struct ui_browser *browser __maybe_unused,
|
||||
void *entry)
|
||||
{
|
||||
struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node);
|
||||
struct evsel *evsel = list_entry(entry, struct evsel, node);
|
||||
|
||||
if (symbol_conf.event_group && !perf_evsel__is_group_leader(evsel))
|
||||
return true;
|
||||
@@ -3367,8 +3367,8 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist,
|
||||
bool warn_lost_event,
|
||||
struct annotation_options *annotation_opts)
|
||||
{
|
||||
struct perf_evsel *pos;
|
||||
struct perf_evsel_menu menu = {
|
||||
struct evsel *pos;
|
||||
struct evsel_menu menu = {
|
||||
.b = {
|
||||
.entries = &evlist->entries,
|
||||
.refresh = ui_browser__list_head_refresh,
|
||||
@@ -3408,7 +3408,7 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
|
||||
|
||||
single_entry:
|
||||
if (nr_entries == 1) {
|
||||
struct perf_evsel *first = perf_evlist__first(evlist);
|
||||
struct evsel *first = perf_evlist__first(evlist);
|
||||
|
||||
return perf_evsel__hists_browse(first, nr_entries, help,
|
||||
false, hbt, min_pcnt,
|
||||
@@ -3417,7 +3417,7 @@ single_entry:
|
||||
}
|
||||
|
||||
if (symbol_conf.event_group) {
|
||||
struct perf_evsel *pos;
|
||||
struct evsel *pos;
|
||||
|
||||
nr_entries = 0;
|
||||
evlist__for_each_entry(evlist, pos) {
|
||||
|
Reference in New Issue
Block a user