perf tools: Initial libperf separation
Subsystems (9)
Jiri Olsa
reviewerPATCH 33/79 libperf: Add perf_thread_map__get/perf_thread_map__put
In reply to Jiri OlsaMoving following functions:
thread_map__get
thread_map__put
thread_map__comm
under libperf with following names:
perf_thread_map__get
perf_thread_map__put
perf_thread_map__comm
Adding perf_thread_map__comm function for it to work/compile.
--- tools/perf/builtin-record.c | 2 +- tools/perf/lib/include/perf/threadmap.h | 4 +++ tools/perf/lib/libperf.map | 3 ++ tools/perf/lib/threadmap.c | 33 ++++++++++++++++++++++ tools/perf/tests/code-reading.c | 4 +-- tools/perf/tests/event-times.c | 4 +-- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/mmap-thread-lookup.c | 2 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/openat-syscall.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/tests/thread-map.c | 18 ++++++------ tools/perf/util/event.c | 4 +-- tools/perf/util/evlist.c | 12 ++++---- tools/perf/util/evsel.c | 2 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/python.c | 2 +- tools/perf/util/stat-display.c | 2 +- tools/perf/util/thread_map.c | 26 ----------------- tools/perf/util/thread_map.h | 8 ------ 23 files changed, 74 insertions(+), 68 deletions(-)
tools/perf/builtin-record.c +1 -1
@@ -1060,7 +1060,7 @@ static int record__synthesize_workload(struct record *rec, bool tail) process_synthesized_event, &rec->session->machines.host, rec->opts.sample_address); -thread_map__put (thread_map); +perf_thread_map__put (thread_map);return err; }
tools/perf/lib/include/perf/threadmap.h +4 -0
@@ -10,5 +10,9 @@ struct perf_thread_map; LIBPERF_API struct perf_thread_map *perf_thread_map__new_dummy(void); LIBPERF_API void perf_thread_map__set_pid(struct perf_thread_map *map, int thread, pid_t pid); +LIBPERF_API char *perf_thread_map__comm(struct perf_thread_map *map, int thread); + +LIBPERF_API struct perf_thread_map *perf_thread_map__get(struct perf_thread_map *map); +LIBPERF_API void perf_thread_map__put(struct perf_thread_map *map);#endif /* __LIBPERF_THREADMAP_H */
tools/perf/lib/libperf.map +3 -0
@@ -6,6 +6,9 @@ LIBPERF_0.0.1 { perf_cpu_map__put; perf_thread_map__new_dummy; perf_thread_map__set_pid; + perf_thread_map__comm; + perf_thread_map__get; + perf_thread_map__put; local: *; };
tools/perf/lib/threadmap.c +33 -0
@@ -4,6 +4,8 @@#include <linux/refcount.h> #include <internal/threadmap.h> #include <string.h> +#include <asm/bug.h> +#include <stdio.h> static void perf_thread_map__reset (struct perf_thread_map *map,int start,int nr) {
@@ -35,6 +37,11 @@ void perf_thread_map__set_pid(struct perf_thread_map *map, int thread, pid_t pid map->map[thread].pid = pid; } +char *perf_thread_map__comm (struct perf_thread_map *map,int thread) +{ +return map->map[thread].comm; +} +struct perf_thread_map *perf_thread_map__new_dummy (void ) {struct perf_thread_map *threads =thread_map__alloc (1 );
@@ -46,3 +53,29 @@ struct perf_thread_map *perf_thread_map__new_dummy(void) }return threads; } + +static void perf_thread_map__delete (struct perf_thread_map *threads) +{ +if (threads) { +int i; + +WARN_ONCE (refcount_read (&threads->refcnt) !=0 , +"thread map refcnt unbalanced\n" ); +for (i =0 ; i < threads->nr; i++) +free (perf_thread_map__comm (threads, i)); +free (threads); + } +} + +struct perf_thread_map *perf_thread_map__get (struct perf_thread_map *map) +{ +if (map) +refcount_inc (&map->refcnt); +return map; +} + +void perf_thread_map__put (struct perf_thread_map *map) +{ +if (map &&refcount_dec_and_test (&map->refcnt)) +perf_thread_map__delete (map); +}
tools/perf/tests/code-reading.c +2 -2
@@ -656,7 +656,7 @@ static int do_test_code_reading(bool try_kcore)* call. Getting refference to keep them alive. */ perf_cpu_map__get (cpus); -thread_map__get (threads); +perf_thread_map__get (threads);perf_evlist__set_maps (evlist,NULL ,NULL );evlist__delete (evlist); evlist =NULL ;
@@ -706,7 +706,7 @@ static int do_test_code_reading(bool try_kcore)evlist__delete (evlist); }else {perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); }machine__delete_threads (machine);machine__delete (machine);
tools/perf/tests/event-times.c +2 -2
@@ -76,7 +76,7 @@ static int attach__current_disabled(struct evlist *evlist)return err; } -thread_map__put (threads); +perf_thread_map__put (threads);return evsel__enable (evsel) ==0 ?TEST_OK :TEST_FAIL ; }
@@ -96,7 +96,7 @@ static int attach__current_enabled(struct evlist *evlist) err =perf_evsel__open_per_thread (evsel, threads); -thread_map__put (threads); +perf_thread_map__put (threads);return err ==0 ?TEST_OK :TEST_FAIL ; }
tools/perf/tests/keep-tracking.c +1 -1
@@ -150,7 +150,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_unevlist__delete (evlist); }else {perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); }return err;
tools/perf/tests/mmap-basic.c +1 -1
@@ -157,6 +157,6 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse out_free_cpus:perf_cpu_map__put (cpus); out_free_threads: -thread_map__put (threads); +perf_thread_map__put (threads);return err; }
tools/perf/tests/mmap-thread-lookup.c +1 -1
@@ -147,7 +147,7 @@ static int synth_process(struct machine *machine) perf_event__process, machine, 0); -thread_map__put (map); +perf_thread_map__put (map);return err; }
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -122,6 +122,6 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int out_cpu_map_delete:perf_cpu_map__put (cpus); out_thread_map_delete: -thread_map__put (threads); +perf_thread_map__put (threads);return err; }
tools/perf/tests/openat-syscall.c +1 -1
@@ -61,6 +61,6 @@ int test__openat_syscall_event(struct test *test __maybe_unused, int subtest __m out_evsel_delete:evsel__delete (evsel); out_thread_map_delete: -thread_map__put (threads); +perf_thread_map__put (threads);return err; }
tools/perf/tests/sw-clock.c +1 -1
@@ -126,7 +126,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) out_free_maps:perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); out_delete_evlist:evlist__delete (evlist);return err;
tools/perf/tests/switch-tracking.c +1 -1
@@ -570,7 +570,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_evlist__delete (evlist); }else {perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); }return err;
tools/perf/tests/task-exit.c +1 -1
@@ -136,7 +136,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused out_free_maps:perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); out_delete_evlist:evlist__delete (evlist);return err;
tools/perf/tests/thread-map.c +9 -9
@@ -28,11 +28,11 @@ int test__thread_map(struct test *test __maybe_unused, int subtest __maybe_unuseTEST_ASSERT_VAL ("wrong pid" ,thread_map__pid (map,0 ) ==getpid ());TEST_ASSERT_VAL ("wrong comm" , -thread_map__comm (map,0 ) && - !strcmp (thread_map__comm (map,0 ),NAME )); +perf_thread_map__comm (map,0 ) && + !strcmp (perf_thread_map__comm (map,0 ),NAME ));TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&map->refcnt) ==1 ); -thread_map__put (map); +perf_thread_map__put (map);/* test dummy pid */ map =perf_thread_map__new_dummy ();
@@ -43,11 +43,11 @@ int test__thread_map(struct test *test __maybe_unused, int subtest __maybe_unuseTEST_ASSERT_VAL ("wrong nr" , map->nr ==1 );TEST_ASSERT_VAL ("wrong pid" ,thread_map__pid (map,0 ) ==-1 );TEST_ASSERT_VAL ("wrong comm" , -thread_map__comm (map,0 ) && - !strcmp (thread_map__comm (map,0 ),"dummy" )); +perf_thread_map__comm (map,0 ) && + !strcmp (perf_thread_map__comm (map,0 ),"dummy" ));TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&map->refcnt) ==1 ); -thread_map__put (map); +perf_thread_map__put (map);return 0 ; }
@@ -70,11 +70,11 @@ static int process_event(struct perf_tool *tool __maybe_unused,TEST_ASSERT_VAL ("wrong pid" ,thread_map__pid (threads,0 ) ==getpid ());TEST_ASSERT_VAL ("wrong comm" , -thread_map__comm (threads,0 ) && - !strcmp (thread_map__comm (threads,0 ),NAME )); +perf_thread_map__comm (threads,0 ) && + !strcmp (perf_thread_map__comm (threads,0 ),NAME ));TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&threads->refcnt) ==1 ); -thread_map__put (threads); +perf_thread_map__put (threads);return 0 ; }
tools/perf/util/event.c +2 -2
@@ -992,7 +992,7 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool,for (i =0 ; i < threads->nr; i++) {struct thread_map_event_entry *entry = &event->thread_map.entries[i]; -char *comm =thread_map__comm (threads, i); +char *comm =perf_thread_map__comm (threads, i);if (!comm) comm = (char *)"" ;
@@ -1387,7 +1387,7 @@ size_t perf_event__fprintf_thread_map(union perf_event *event, FILE *fp)else ret +=fprintf (fp,"failed to get threads from event\n" ); -thread_map__put (threads); +perf_thread_map__put (threads);return ret; }
tools/perf/util/evlist.c +6 -6
@@ -142,7 +142,7 @@ void evlist__delete(struct evlist *evlist)perf_evlist__munmap (evlist);evlist__close (evlist);perf_cpu_map__put (evlist->cpus); -thread_map__put (evlist->threads); +perf_thread_map__put (evlist->threads); evlist->cpus =NULL ; evlist->threads =NULL ;perf_evlist__purge (evlist);
@@ -165,8 +165,8 @@ static void __perf_evlist__propagate_maps(struct evlist *evlist, evsel->cpus =perf_cpu_map__get (evsel->own_cpus); } -thread_map__put (evsel->threads); - evsel->threads =thread_map__get (evlist->threads); +perf_thread_map__put (evsel->threads); + evsel->threads =perf_thread_map__get (evlist->threads); }static void perf_evlist__propagate_maps (struct evlist *evlist)
@@ -1100,7 +1100,7 @@ int perf_evlist__create_maps(struct evlist *evlist, struct target *target)return 0 ; out_delete_threads: -thread_map__put (threads); +perf_thread_map__put (threads);return -1 ; }
@@ -1120,8 +1120,8 @@ void perf_evlist__set_maps(struct evlist *evlist, struct perf_cpu_map *cpus, }if (threads != evlist->threads) { -thread_map__put (evlist->threads); - evlist->threads =thread_map__get (threads); +perf_thread_map__put (evlist->threads); + evlist->threads =perf_thread_map__get (threads); }perf_evlist__propagate_maps (evlist);
tools/perf/util/evsel.c +1 -1
@@ -1327,7 +1327,7 @@ void perf_evsel__exit(struct evsel *evsel)cgroup__put (evsel->cgrp);perf_cpu_map__put (evsel->cpus);perf_cpu_map__put (evsel->own_cpus); -thread_map__put (evsel->threads); +perf_thread_map__put (evsel->threads);zfree (&evsel->group_name);zfree (&evsel->name); perf_evsel__object.fini (evsel);
tools/perf/util/parse-events.c +1 -1
@@ -2337,7 +2337,7 @@ static bool is_event_supported(u8 type, unsigned config)evsel__delete (evsel); } -thread_map__put (tmap); +perf_thread_map__put (tmap);return ret; }
tools/perf/util/python.c +1 -1
@@ -626,7 +626,7 @@ static int pyrf_thread_map__init(struct pyrf_thread_map *pthreads,static void pyrf_thread_map__delete (struct pyrf_thread_map *pthreads) { -thread_map__put (pthreads->threads); +perf_thread_map__put (pthreads->threads);Py_TYPE (pthreads)->tp_free ((PyObject *)pthreads); }
tools/perf/util/stat-display.c +1 -1
@@ -116,7 +116,7 @@ static void aggr_printout(struct perf_stat_config *config,case AGGR_THREAD :fprintf (config->output,"%*s-%*d%s" , config->csv_output ?0 :16 , -thread_map__comm (evsel->threads, id), +perf_thread_map__comm (evsel->threads, id), config->csv_output ?0 :-8 ,thread_map__pid (evsel->threads, id), config->csv_sep);
tools/perf/util/thread_map.c +0 -26
@@ -304,32 +304,6 @@ struct perf_thread_map *thread_map__new_str(const char *pid, const char *tid,return thread_map__new_by_tid_str (tid); } -static void thread_map__delete (struct perf_thread_map *threads) -{ -if (threads) { -int i; - -WARN_ONCE (refcount_read (&threads->refcnt) !=0 , -"thread map refcnt unbalanced\n" ); -for (i =0 ; i < threads->nr; i++) -free (thread_map__comm (threads, i)); -free (threads); - } -} - -struct perf_thread_map *thread_map__get (struct perf_thread_map *map) -{ -if (map) -refcount_inc (&map->refcnt); -return map; -} - -void thread_map__put (struct perf_thread_map *map) -{ -if (map &&refcount_dec_and_test (&map->refcnt)) -thread_map__delete (map); -} -size_t thread_map__fprintf (struct perf_thread_map *threads,FILE *fp) {int i;
tools/perf/util/thread_map.h +0 -8
@@ -18,9 +18,6 @@ struct perf_thread_map *thread_map__new_all_cpus(void);struct perf_thread_map *thread_map__new (pid_t pid,pid_t tid,uid_t uid);struct perf_thread_map *thread_map__new_event (struct thread_map_event *event); -struct perf_thread_map *thread_map__get (struct perf_thread_map *map); -void thread_map__put (struct perf_thread_map *map); -struct perf_thread_map *thread_map__new_str (const char *pid,const char *tid,uid_t uid,bool all_threads);
@@ -38,11 +35,6 @@ static inline pid_t thread_map__pid(struct perf_thread_map *map, int thread)return map->map[thread].pid; } -static inline char *thread_map__comm (struct perf_thread_map *map,int thread) -{ -return map->map[thread].comm; -} -void thread_map__read_comms (struct perf_thread_map *threads);bool thread_map__has (struct perf_thread_map *threads,pid_t pid);int thread_map__remove (struct perf_thread_map *threads,int idx);
Signature · 1 line
2.21.0
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Add perf_thread_map__get()/perf_thread_map__put()
libperf: Add perf_thread_map__get()/perf_thread_map__put()
Commit-ID: 7836e52e518b5e3fd695850f1d4081f756f58406 Gitweb: https://git.kernel.org/tip/7836e52e518b5e3fd695850f1d4081f756f58406 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:20 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Add perf_thread_map__get()/perf_thread_map__put()
Move the following functions:
thread_map__get()
thread_map__put()
thread_map__comm()
to libperf with the following names:
perf_thread_map__get()
perf_thread_map__put()
perf_thread_map__comm()
Add the perf_thread_map__comm() function for it to work/compile.
--- tools/perf/builtin-record.c | 2 +- tools/perf/lib/include/perf/threadmap.h | 4 ++++ tools/perf/lib/libperf.map | 3 +++ tools/perf/lib/threadmap.c | 33 ++++++++++++++++++++++++++++++ tools/perf/tests/code-reading.c | 4 ++-- tools/perf/tests/event-times.c | 4 ++-- tools/perf/tests/keep-tracking.c | 2 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/mmap-thread-lookup.c | 2 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/openat-syscall.c | 2 +- tools/perf/tests/sw-clock.c | 2 +- tools/perf/tests/switch-tracking.c | 2 +- tools/perf/tests/task-exit.c | 2 +- tools/perf/tests/thread-map.c | 18 ++++++++-------- tools/perf/util/event.c | 4 ++-- tools/perf/util/evlist.c | 12 +++++------ tools/perf/util/evsel.c | 2 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/python.c | 2 +- tools/perf/util/stat-display.c | 2 +- tools/perf/util/thread_map.c | 26 ----------------------- tools/perf/util/thread_map.h | 8 -------- 23 files changed, 74 insertions(+), 68 deletions(-)
tools/perf/builtin-record.c +1 -1
@@ -1060,7 +1060,7 @@ static int record__synthesize_workload(struct record *rec, bool tail) process_synthesized_event, &rec->session->machines.host, rec->opts.sample_address); -thread_map__put (thread_map); +perf_thread_map__put (thread_map);return err; }
tools/perf/lib/include/perf/threadmap.h +4 -0
@@ -10,5 +10,9 @@ struct perf_thread_map; LIBPERF_API struct perf_thread_map *perf_thread_map__new_dummy(void); LIBPERF_API void perf_thread_map__set_pid(struct perf_thread_map *map, int thread, pid_t pid); +LIBPERF_API char *perf_thread_map__comm(struct perf_thread_map *map, int thread); + +LIBPERF_API struct perf_thread_map *perf_thread_map__get(struct perf_thread_map *map); +LIBPERF_API void perf_thread_map__put(struct perf_thread_map *map);#endif /* __LIBPERF_THREADMAP_H */
tools/perf/lib/libperf.map +3 -0
@@ -6,6 +6,9 @@ LIBPERF_0.0.1 { perf_cpu_map__put; perf_thread_map__new_dummy; perf_thread_map__set_pid; + perf_thread_map__comm; + perf_thread_map__get; + perf_thread_map__put; local: *; };
tools/perf/lib/threadmap.c +33 -0
@@ -4,6 +4,8 @@#include <linux/refcount.h> #include <internal/threadmap.h> #include <string.h> +#include <asm/bug.h> +#include <stdio.h> static void perf_thread_map__reset (struct perf_thread_map *map,int start,int nr) {
@@ -35,6 +37,11 @@ void perf_thread_map__set_pid(struct perf_thread_map *map, int thread, pid_t pid map->map[thread].pid = pid; } +char *perf_thread_map__comm (struct perf_thread_map *map,int thread) +{ +return map->map[thread].comm; +} +struct perf_thread_map *perf_thread_map__new_dummy (void ) {struct perf_thread_map *threads =thread_map__alloc (1 );
@@ -46,3 +53,29 @@ struct perf_thread_map *perf_thread_map__new_dummy(void) }return threads; } + +static void perf_thread_map__delete (struct perf_thread_map *threads) +{ +if (threads) { +int i; + +WARN_ONCE (refcount_read (&threads->refcnt) !=0 , +"thread map refcnt unbalanced\n" ); +for (i =0 ; i < threads->nr; i++) +free (perf_thread_map__comm (threads, i)); +free (threads); + } +} + +struct perf_thread_map *perf_thread_map__get (struct perf_thread_map *map) +{ +if (map) +refcount_inc (&map->refcnt); +return map; +} + +void perf_thread_map__put (struct perf_thread_map *map) +{ +if (map &&refcount_dec_and_test (&map->refcnt)) +perf_thread_map__delete (map); +}
tools/perf/tests/code-reading.c +2 -2
@@ -656,7 +656,7 @@ static int do_test_code_reading(bool try_kcore)* call. Getting refference to keep them alive. */ perf_cpu_map__get (cpus); -thread_map__get (threads); +perf_thread_map__get (threads);perf_evlist__set_maps (evlist,NULL ,NULL );evlist__delete (evlist); evlist =NULL ;
@@ -706,7 +706,7 @@ out_err:evlist__delete (evlist); }else {perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); }machine__delete_threads (machine);machine__delete (machine);
tools/perf/tests/event-times.c +2 -2
@@ -76,7 +76,7 @@ static int attach__current_disabled(struct evlist *evlist)return err; } -thread_map__put (threads); +perf_thread_map__put (threads);return evsel__enable (evsel) ==0 ?TEST_OK :TEST_FAIL ; }
@@ -96,7 +96,7 @@ static int attach__current_enabled(struct evlist *evlist) err =perf_evsel__open_per_thread (evsel, threads); -thread_map__put (threads); +perf_thread_map__put (threads);return err ==0 ?TEST_OK :TEST_FAIL ; }
tools/perf/tests/keep-tracking.c +1 -1
@@ -150,7 +150,7 @@ out_err:evlist__delete (evlist); }else {perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); }return err;
tools/perf/tests/mmap-basic.c +1 -1
@@ -157,6 +157,6 @@ out_delete_evlist: out_free_cpus:perf_cpu_map__put (cpus); out_free_threads: -thread_map__put (threads); +perf_thread_map__put (threads);return err; }
tools/perf/tests/mmap-thread-lookup.c +1 -1
@@ -147,7 +147,7 @@ static int synth_process(struct machine *machine) perf_event__process, machine, 0); -thread_map__put (map); +perf_thread_map__put (map);return err; }
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -122,6 +122,6 @@ out_evsel_delete: out_cpu_map_delete:perf_cpu_map__put (cpus); out_thread_map_delete: -thread_map__put (threads); +perf_thread_map__put (threads);return err; }
tools/perf/tests/openat-syscall.c +1 -1
@@ -61,6 +61,6 @@ out_close_fd: out_evsel_delete:evsel__delete (evsel); out_thread_map_delete: -thread_map__put (threads); +perf_thread_map__put (threads);return err; }
tools/perf/tests/sw-clock.c +1 -1
@@ -126,7 +126,7 @@ out_init: out_free_maps:perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); out_delete_evlist:evlist__delete (evlist);return err;
tools/perf/tests/switch-tracking.c +1 -1
@@ -570,7 +570,7 @@ out:evlist__delete (evlist); }else {perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); }return err;
tools/perf/tests/task-exit.c +1 -1
@@ -136,7 +136,7 @@ out_init: out_free_maps:perf_cpu_map__put (cpus); -thread_map__put (threads); +perf_thread_map__put (threads); out_delete_evlist:evlist__delete (evlist);return err;
tools/perf/tests/thread-map.c +9 -9
@@ -28,11 +28,11 @@ int test__thread_map(struct test *test __maybe_unused, int subtest __maybe_unuseTEST_ASSERT_VAL ("wrong pid" ,thread_map__pid (map,0 ) ==getpid ());TEST_ASSERT_VAL ("wrong comm" , -thread_map__comm (map,0 ) && - !strcmp (thread_map__comm (map,0 ),NAME )); +perf_thread_map__comm (map,0 ) && + !strcmp (perf_thread_map__comm (map,0 ),NAME ));TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&map->refcnt) ==1 ); -thread_map__put (map); +perf_thread_map__put (map);/* test dummy pid */ map =perf_thread_map__new_dummy ();
@@ -43,11 +43,11 @@ int test__thread_map(struct test *test __maybe_unused, int subtest __maybe_unuseTEST_ASSERT_VAL ("wrong nr" , map->nr ==1 );TEST_ASSERT_VAL ("wrong pid" ,thread_map__pid (map,0 ) ==-1 );TEST_ASSERT_VAL ("wrong comm" , -thread_map__comm (map,0 ) && - !strcmp (thread_map__comm (map,0 ),"dummy" )); +perf_thread_map__comm (map,0 ) && + !strcmp (perf_thread_map__comm (map,0 ),"dummy" ));TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&map->refcnt) ==1 ); -thread_map__put (map); +perf_thread_map__put (map);return 0 ; }
@@ -70,11 +70,11 @@ static int process_event(struct perf_tool *tool __maybe_unused,TEST_ASSERT_VAL ("wrong pid" ,thread_map__pid (threads,0 ) ==getpid ());TEST_ASSERT_VAL ("wrong comm" , -thread_map__comm (threads,0 ) && - !strcmp (thread_map__comm (threads,0 ),NAME )); +perf_thread_map__comm (threads,0 ) && + !strcmp (perf_thread_map__comm (threads,0 ),NAME ));TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&threads->refcnt) ==1 ); -thread_map__put (threads); +perf_thread_map__put (threads);return 0 ; }
tools/perf/util/event.c +2 -2
@@ -992,7 +992,7 @@ int perf_event__synthesize_thread_map2(struct perf_tool *tool,for (i =0 ; i < threads->nr; i++) {struct thread_map_event_entry *entry = &event->thread_map.entries[i]; -char *comm =thread_map__comm (threads, i); +char *comm =perf_thread_map__comm (threads, i);if (!comm) comm = (char *)"" ;
@@ -1387,7 +1387,7 @@ size_t perf_event__fprintf_thread_map(union perf_event *event, FILE *fp)else ret +=fprintf (fp,"failed to get threads from event\n" ); -thread_map__put (threads); +perf_thread_map__put (threads);return ret; }
tools/perf/util/evlist.c +6 -6
@@ -142,7 +142,7 @@ void evlist__delete(struct evlist *evlist)perf_evlist__munmap (evlist);evlist__close (evlist);perf_cpu_map__put (evlist->cpus); -thread_map__put (evlist->threads); +perf_thread_map__put (evlist->threads); evlist->cpus =NULL ; evlist->threads =NULL ;perf_evlist__purge (evlist);
@@ -165,8 +165,8 @@ static void __perf_evlist__propagate_maps(struct evlist *evlist, evsel->cpus =perf_cpu_map__get (evsel->own_cpus); } -thread_map__put (evsel->threads); - evsel->threads =thread_map__get (evlist->threads); +perf_thread_map__put (evsel->threads); + evsel->threads =perf_thread_map__get (evlist->threads); }static void perf_evlist__propagate_maps (struct evlist *evlist)
@@ -1100,7 +1100,7 @@ int perf_evlist__create_maps(struct evlist *evlist, struct target *target)return 0 ; out_delete_threads: -thread_map__put (threads); +perf_thread_map__put (threads);return -1 ; }
@@ -1120,8 +1120,8 @@ void perf_evlist__set_maps(struct evlist *evlist, struct perf_cpu_map *cpus, }if (threads != evlist->threads) { -thread_map__put (evlist->threads); - evlist->threads =thread_map__get (threads); +perf_thread_map__put (evlist->threads); + evlist->threads =perf_thread_map__get (threads); }perf_evlist__propagate_maps (evlist);
tools/perf/util/evsel.c +1 -1
@@ -1327,7 +1327,7 @@ void perf_evsel__exit(struct evsel *evsel)cgroup__put (evsel->cgrp);perf_cpu_map__put (evsel->cpus);perf_cpu_map__put (evsel->own_cpus); -thread_map__put (evsel->threads); +perf_thread_map__put (evsel->threads);zfree (&evsel->group_name);zfree (&evsel->name); perf_evsel__object.fini (evsel);
tools/perf/util/parse-events.c +1 -1
@@ -2337,7 +2337,7 @@ static bool is_event_supported(u8 type, unsigned config)evsel__delete (evsel); } -thread_map__put (tmap); +perf_thread_map__put (tmap);return ret; }
tools/perf/util/python.c +1 -1
@@ -626,7 +626,7 @@ static int pyrf_thread_map__init(struct pyrf_thread_map *pthreads,static void pyrf_thread_map__delete (struct pyrf_thread_map *pthreads) { -thread_map__put (pthreads->threads); +perf_thread_map__put (pthreads->threads);Py_TYPE (pthreads)->tp_free ((PyObject *)pthreads); }
tools/perf/util/stat-display.c +1 -1
@@ -116,7 +116,7 @@ static void aggr_printout(struct perf_stat_config *config,case AGGR_THREAD :fprintf (config->output,"%*s-%*d%s" , config->csv_output ?0 :16 , -thread_map__comm (evsel->threads, id), +perf_thread_map__comm (evsel->threads, id), config->csv_output ?0 :-8 ,thread_map__pid (evsel->threads, id), config->csv_sep);
tools/perf/util/thread_map.c +0 -26
@@ -304,32 +304,6 @@ struct perf_thread_map *thread_map__new_str(const char *pid, const char *tid,return thread_map__new_by_tid_str (tid); } -static void thread_map__delete (struct perf_thread_map *threads) -{ -if (threads) { -int i; - -WARN_ONCE (refcount_read (&threads->refcnt) !=0 , -"thread map refcnt unbalanced\n" ); -for (i =0 ; i < threads->nr; i++) -free (thread_map__comm (threads, i)); -free (threads); - } -} - -struct perf_thread_map *thread_map__get (struct perf_thread_map *map) -{ -if (map) -refcount_inc (&map->refcnt); -return map; -} - -void thread_map__put (struct perf_thread_map *map) -{ -if (map &&refcount_dec_and_test (&map->refcnt)) -thread_map__delete (map); -} -size_t thread_map__fprintf (struct perf_thread_map *threads,FILE *fp) {int i;
tools/perf/util/thread_map.h +0 -8
@@ -18,9 +18,6 @@ struct perf_thread_map *thread_map__new_all_cpus(void);struct perf_thread_map *thread_map__new (pid_t pid,pid_t tid,uid_t uid);struct perf_thread_map *thread_map__new_event (struct thread_map_event *event); -struct perf_thread_map *thread_map__get (struct perf_thread_map *map); -void thread_map__put (struct perf_thread_map *map); -struct perf_thread_map *thread_map__new_str (const char *pid,const char *tid,uid_t uid,bool all_threads);
@@ -38,11 +35,6 @@ static inline pid_t thread_map__pid(struct perf_thread_map *map, int thread)return map->map[thread].pid; } -static inline char *thread_map__comm (struct perf_thread_map *map,int thread) -{ -return map->map[thread].comm; -} -void thread_map__read_comms (struct perf_thread_map *threads);bool thread_map__has (struct perf_thread_map *threads,pid_t pid);int thread_map__remove (struct perf_thread_map *threads,int idx);
Jiri Olsa
reviewerPATCH 34/79 libperf: Add perf_evlist and perf_evsel structs
In reply to Jiri OlsaAdding perf_evlist and perf_evsel structs into libperf.
It's added as a declarations into into:
include/perf/evlist.h
include/perf/evsel.h
which will be included by users.
The definitions are added into:
include/internal/evlist.h
include/internal/evsel.h
which is not to be included by users, but shared
within perf and libperf.
--- tools/perf/lib/Build | 2 ++ tools/perf/lib/evlist.c | 4 ++++ tools/perf/lib/evsel.c | 4 ++++ tools/perf/lib/include/internal/evlist.h | 9 +++++++++ tools/perf/lib/include/internal/evsel.h | 9 +++++++++ tools/perf/lib/include/perf/evlist.h | 7 +++++++ tools/perf/lib/include/perf/evsel.h | 7 +++++++ 7 files changed, 42 insertions(+) create mode 100644 tools/perf/lib/evlist.c create mode 100644 tools/perf/lib/evsel.c create mode 100644 tools/perf/lib/include/internal/evlist.h create mode 100644 tools/perf/lib/include/internal/evsel.h create mode 100644 tools/perf/lib/include/perf/evlist.h create mode 100644 tools/perf/lib/include/perf/evsel.h
tools/perf/lib/Build +2 -0
@@ -1,3 +1,5 @@ libperf-y += core.o libperf-y += cpumap.o libperf-y += threadmap.o +libperf-y += evsel.o +libperf-y += evlist.o
tools/perf/lib/evlist.c new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <perf/evlist.h> +#include <linux/list.h> +#include <internal/evlist.h>
tools/perf/lib/evsel.c new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <perf/evsel.h> +#include <linux/list.h> +#include <internal/evsel.h>
tools/perf/lib/include/internal/evlist.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_INTERNAL_EVLIST_H +#define __LIBPERF_INTERNAL_EVLIST_H + +struct perf_evlist { +struct list_head entries; +}; + +#endif /* __LIBPERF_INTERNAL_EVLIST_H */
tools/perf/lib/include/internal/evsel.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_INTERNAL_EVSEL_H +#define __LIBPERF_INTERNAL_EVSEL_H + +struct perf_evsel { +struct list_head node; +}; + +#endif /* __LIBPERF_INTERNAL_EVSEL_H */
tools/perf/lib/include/perf/evlist.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_EVLIST_H +#define __LIBPERF_EVLIST_H + +struct perf_evlist ; + +#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/include/perf/evsel.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_EVSEL_H +#define __LIBPERF_EVSEL_H + +struct perf_evsel ; + +#endif /* __LIBPERF_EVSEL_H */
Signature · 1 line
2.21.0
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Add perf_evlist and perf_evsel structs
libperf: Add perf_evlist and perf_evsel structs
Commit-ID: 285a30c36d1e18e7e2afa24dae50ba5596be45e7 Gitweb: https://git.kernel.org/tip/285a30c36d1e18e7e2afa24dae50ba5596be45e7 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:21 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Add perf_evlist and perf_evsel structs
Add the perf_evlist and perf_evsel structs to libperf.
It's added as a declarations into:
include/perf/evlist.h
include/perf/evsel.h
which will be included by users.
The definitions are added into:
include/internal/evlist.h
include/internal/evsel.h
which is not to be included by users, but shared
within perf and libperf.
--- tools/perf/lib/Build | 2 ++ tools/perf/lib/evlist.c | 4 ++++ tools/perf/lib/evsel.c | 4 ++++ tools/perf/lib/include/internal/evlist.h | 9 +++++++++ tools/perf/lib/include/internal/evsel.h | 9 +++++++++ tools/perf/lib/include/perf/evlist.h | 7 +++++++ tools/perf/lib/include/perf/evsel.h | 7 +++++++ 7 files changed, 42 insertions(+)
tools/perf/lib/Build +2 -0
@@ -1,3 +1,5 @@ libperf-y += core.o libperf-y += cpumap.o libperf-y += threadmap.o +libperf-y += evsel.o +libperf-y += evlist.o
tools/perf/lib/evlist.c new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <perf/evlist.h> +#include <linux/list.h> +#include <internal/evlist.h>
tools/perf/lib/evsel.c new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <perf/evsel.h> +#include <linux/list.h> +#include <internal/evsel.h>
tools/perf/lib/include/internal/evlist.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_INTERNAL_EVLIST_H +#define __LIBPERF_INTERNAL_EVLIST_H + +struct perf_evlist { +struct list_head entries; +}; + +#endif /* __LIBPERF_INTERNAL_EVLIST_H */
tools/perf/lib/include/internal/evsel.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_INTERNAL_EVSEL_H +#define __LIBPERF_INTERNAL_EVSEL_H + +struct perf_evsel { +struct list_head node; +}; + +#endif /* __LIBPERF_INTERNAL_EVSEL_H */
tools/perf/lib/include/perf/evlist.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_EVLIST_H +#define __LIBPERF_EVLIST_H + +struct perf_evlist ; + +#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/include/perf/evsel.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_EVSEL_H +#define __LIBPERF_EVSEL_H + +struct perf_evsel ; + +#endif /* __LIBPERF_EVSEL_H */
Jiri Olsa
reviewerPATCH 35/79 libperf: Include perf_evsel in evsel object
In reply to Jiri OlsaIncluding perf_evsel in evsel object, will continue to move other generic things into libperf evsel.
--- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/ui/browsers/hists.c | 8 ++++---- tools/perf/util/evlist.c | 16 ++++++++-------- tools/perf/util/evlist.h | 12 ++++++------ tools/perf/util/evsel.c | 4 ++-- tools/perf/util/evsel.h | 16 ++++++++-------- tools/perf/util/parse-events.c | 20 ++++++++++---------- tools/perf/util/stat-display.c | 4 ++-- tools/perf/util/trace-event-info.c | 4 ++-- 10 files changed, 44 insertions(+), 44 deletions(-)
tools/perf/builtin-sched.c +1 -1
@@ -2929,7 +2929,7 @@ static int timehist_check_attr(struct perf_sched *sched,struct evsel *evsel;struct evsel_runtime *er; -list_for_each_entry (evsel, &evlist->entries, node) { +list_for_each_entry (evsel, &evlist->entries, core.node) { er =perf_evsel__get_runtime (evsel);if (er ==NULL ) {pr_err ("Failed to allocate memory for evsel runtime data\n" );
tools/perf/builtin-trace.c +1 -1
@@ -2648,7 +2648,7 @@ static bool evlist__add_vfs_getname(struct evlist *evlist)continue ; } -list_del_init (&evsel->node); +list_del_init (&evsel->core.node); evsel->evlist =NULL ;evsel__delete (evsel); }
tools/perf/ui/browsers/hists.c +4 -4
@@ -3212,7 +3212,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, {struct evsel_menu *menu =container_of (browser, struct evsel_menu, b); - struct evsel *evsel = list_entry(entry, struct evsel, node); + struct evsel *evsel = list_entry(entry, struct evsel, core.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 ];
@@ -3309,13 +3309,13 @@ static int perf_evsel_menu__run(struct evsel_menu *menu,ui_browser__show_title (&menu->b, title);switch (key) {case K_TAB : -if (pos->node.next == &evlist->entries) +if (pos->core.node.next == &evlist->entries) pos =perf_evlist__first (evlist);else pos =perf_evsel__next (pos); goto browse_hists;case K_UNTAB : -if (pos->node.prev == &evlist->entries) +if (pos->core.node.prev == &evlist->entries) pos =perf_evlist__last (evlist);else pos =perf_evsel__prev (pos);
@@ -3351,7 +3351,7 @@ static int perf_evsel_menu__run(struct evsel_menu *menu,static bool filter_group_entries (struct ui_browser *browser__maybe_unused ,void *entry) { - struct evsel *evsel = list_entry(entry, struct evsel, node); + struct evsel *evsel = list_entry(entry, struct evsel, core.node);if (symbol_conf.event_group && !perf_evsel__is_group_leader (evsel))return true;
tools/perf/util/evlist.c +8 -8
@@ -119,7 +119,7 @@ static void perf_evlist__purge(struct evlist *evlist)struct evsel *pos, *n;evlist__for_each_entry_safe (evlist, n, pos) { -list_del_init (&pos->node); +list_del_init (&pos->core.node); pos->evlist =NULL ;evsel__delete (pos); }
@@ -180,7 +180,7 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { entry->evlist = evlist; -list_add_tail (&entry->node, &evlist->entries); +list_add_tail (&entry->core.node, &evlist->entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
@@ -193,7 +193,7 @@ void evlist__add(struct evlist *evlist, struct evsel *entry)void evlist__remove (struct evlist *evlist,struct evsel *evsel) { evsel->evlist =NULL ; -list_del_init (&evsel->node); +list_del_init (&evsel->core.node); evlist->nr_entries -=1 ; }
@@ -203,7 +203,7 @@ void perf_evlist__splice_list_tail(struct evlist *evlist,struct evsel *evsel, *temp;__evlist__for_each_entry_safe (list, temp, evsel) { -list_del_init (&evsel->node); +list_del_init (&evsel->core.node);evlist__add (evlist, evsel); } }
@@ -212,8 +212,8 @@ void __perf_evlist__set_leader(struct list_head *list) {struct evsel *evsel, *leader; - leader = list_entry(list->next, struct evsel, node); - evsel = list_entry(list->prev, struct evsel, node); + leader = list_entry(list->next, struct evsel, core.node); + evsel = list_entry(list->prev, struct evsel, core.node); leader->nr_members = evsel->idx - leader->idx +1 ;
@@ -268,7 +268,7 @@ static int evlist__add_attrs(struct evlist *evlist, evsel =perf_evsel__new_idx (attrs + i, evlist->nr_entries + i);if (evsel ==NULL ) goto out_delete_partial_list; -list_add_tail (&evsel->node, &head); +list_add_tail (&evsel->core.node, &head); }perf_evlist__splice_list_tail (evlist, &head);
@@ -1680,7 +1680,7 @@ void perf_evlist__to_front(struct evlist *evlist,evlist__for_each_entry_safe (evlist, n, evsel) {if (evsel->leader == move_evsel->leader) -list_move_tail (&evsel->node, &move); +list_move_tail (&evsel->core.node, &move); }list_splice (&move, &evlist->entries);
tools/perf/util/evlist.h +6 -6
@@ -230,12 +230,12 @@ static inline bool perf_evlist__empty(struct evlist *evlist)static inline struct evsel *perf_evlist__first (struct evlist *evlist) { - return list_entry(evlist->entries.next, struct evsel, node); + return list_entry(evlist->entries.next, struct evsel, core.node); }static inline struct evsel *perf_evlist__last (struct evlist *evlist) { - return list_entry(evlist->entries.prev, struct evsel, node); + return list_entry(evlist->entries.prev, struct evsel, core.node); }size_t perf_evlist__fprintf (struct evlist *evlist,FILE *fp);
@@ -253,7 +253,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry (list, evsel) \ - list_for_each_entry(evsel, list, node) + list_for_each_entry(evsel, list, core.node)/** * evlist__for_each_entry - iterate thru all the evsels
@@ -269,7 +269,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry_continue (list, evsel) \ - list_for_each_entry_continue(evsel, list, node) + list_for_each_entry_continue(evsel, list, core.node)/** * evlist__for_each_entry_continue - continue iteration thru all the evsels
@@ -285,7 +285,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry_reverse (list, evsel) \ - list_for_each_entry_reverse(evsel, list, node) + list_for_each_entry_reverse(evsel, list, core.node)/** * evlist__for_each_entry_reverse - iterate thru all the evsels in reverse order
@@ -302,7 +302,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry_safe (list, tmp, evsel) \ - list_for_each_entry_safe(evsel, tmp, list, node) + list_for_each_entry_safe(evsel, tmp, list, core.node)/** * evlist__for_each_entry_safe - safely iterate thru all the evsels
tools/perf/util/evsel.c +2 -2
@@ -236,7 +236,7 @@ void evsel__init(struct evsel *evsel, evsel->evlist =NULL ; evsel->bpf_obj =NULL ; evsel->bpf_fd =-1 ; -INIT_LIST_HEAD (&evsel->node); +INIT_LIST_HEAD (&evsel->core.node);INIT_LIST_HEAD (&evsel->config_terms); perf_evsel__object.init (evsel); evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);
@@ -1318,7 +1318,7 @@ void perf_evsel__close_fd(struct evsel *evsel)void perf_evsel__exit (struct evsel *evsel) { -assert (list_empty (&evsel->node)); +assert (list_empty (&evsel->core.node));assert (evsel->evlist ==NULL );perf_evsel__free_counts (evsel);perf_evsel__free_fd (evsel);
tools/perf/util/evsel.h +8 -8
@@ -7,6 +7,7 @@#include <stddef.h> #include <linux/perf_event.h> #include <linux/types.h> +#include <internal/evsel.h> #include "xyarray.h" #include "symbol_conf.h" #include "cpumap.h"
@@ -87,8 +88,7 @@ struct bpf_object;/** struct evsel - event selector * * @evlist - evlist this evsel is in, if it is in one. -* @node - To insert it into evlist->entries or in other list_heads, say in -* the event parsing routines. +* @core - libperf evsel object * @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.
@@ -101,7 +101,7 @@ struct bpf_object;* @priv: And what is in its containing unnamed union are tool specific */ struct evsel { -struct list_head node; +struct perf_evsel core;struct evlist *evlist;struct perf_event_attr attr;char *filter;
@@ -386,12 +386,12 @@ int perf_evsel__parse_sample_timestamp(struct evsel *evsel,static inline struct evsel *perf_evsel__next (struct evsel *evsel) { - return list_entry(evsel->node.next, struct evsel, node); + return list_entry(evsel->core.node.next, struct evsel, core.node); }static inline struct evsel *perf_evsel__prev (struct evsel *evsel) { - return list_entry(evsel->node.prev, struct evsel, node); + return list_entry(evsel->core.node.prev, struct evsel, core.node); }/**
@@ -478,15 +478,15 @@ static inline int perf_evsel__group_idx(struct evsel *evsel)/* Iterates group WITHOUT the leader. */ #define for_each_group_member (_evsel, _leader) \ -for ((_evsel) = list_entry((_leader)->node.next, struct evsel, node); \ +for ((_evsel) = list_entry((_leader)->core.node.next, struct evsel, core.node); \ (_evsel) && (_evsel)->leader == (_leader); \ - (_evsel) = list_entry((_evsel)->node.next, struct evsel, node)) + (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node))/* Iterates group WITH the leader. */ #define for_each_group_evsel (_evsel, _leader) \ for ((_evsel) = _leader; \ (_evsel) && (_evsel)->leader == (_leader); \ - (_evsel) = list_entry((_evsel)->node.next, struct evsel, node)) + (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node))static inline bool perf_evsel__has_branch_callstack (const struct evsel *evsel) {
tools/perf/util/parse-events.c +10 -10
@@ -343,7 +343,7 @@ __add_event(struct list_head *list, int *idx,if (config_terms)list_splice (config_terms, &evsel->config_terms); -list_add_tail (&evsel->node, list); +list_add_tail (&evsel->core.node, list);return evsel; }
@@ -526,7 +526,7 @@ static int add_tracepoint(struct list_head *list, int *idx,list_splice (&config_terms, &evsel->config_terms); } -list_add_tail (&evsel->node, list); +list_add_tail (&evsel->core.node, list);return 0 ; }
@@ -660,15 +660,15 @@ static int add_bpf_event(const char *group, const char *event, int fd, struct bppr_debug ("Failed to add BPF event %s:%s\n" , group, event); -list_for_each_entry_safe (evsel, tmp, &new_evsels, node) { -list_del_init (&evsel->node); +list_for_each_entry_safe (evsel, tmp, &new_evsels, core.node) { +list_del_init (&evsel->core.node);evsel__delete (evsel); }return err; }pr_debug ("adding %s:%s\n" , group, event); -list_for_each_entry (pos, &new_evsels, node) { +list_for_each_entry (pos, &new_evsels, core.node) {pr_debug ("adding %s:%s to %p\n" , group, event, pos); pos->bpf_fd = fd;
@@ -1458,8 +1458,8 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,bool is_leader = true;int i, nr_pmu =0 , total_members, ret =0 ; - leader = list_first_entry(list, struct evsel, node); - evsel = list_last_entry(list, struct evsel, node); + leader = list_first_entry(list, struct evsel, core.node); + evsel = list_last_entry(list, struct evsel, core.node); total_members = evsel->idx - leader->idx +1 ; leaders =calloc (total_members,sizeof (uintptr_t ));
@@ -1555,7 +1555,7 @@ void parse_events__set_leader(char *name, struct list_head *list,return ;__perf_evlist__set_leader (list); - leader = list_entry(list->next, struct evsel, node); + leader = list_entry(list->next, struct evsel, core.node); leader->group_name = name ?strdup (name) :NULL ; }
@@ -2050,9 +2050,9 @@ foreach_evsel_in_last_glob(struct evlist *evlist,if (!last)return 0 ; -if (last->node.prev == &evlist->entries) +if (last->core.node.prev == &evlist->entries)return 0 ; - last = list_entry(last->node.prev, struct evsel, node); + last = list_entry(last->core.node.prev, struct evsel, core.node); }while (!last->cmdline_group_boundary);return 0 ;
tools/perf/util/stat-display.c +2 -2
@@ -548,8 +548,8 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *cstruct evlist *evlist = counter->evlist;struct evsel *alias; - alias =list_prepare_entry (counter, &(evlist->entries), node); - list_for_each_entry_continue (alias, &evlist->entries, node) { + alias =list_prepare_entry (counter, &(evlist->entries), core.node); + list_for_each_entry_continue (alias, &evlist->entries, core.node) { if (strcmp(perf_evsel__name(alias), perf_evsel__name(counter)) || alias->scale != counter->scale || alias->cgrp != counter->cgrp ||
tools/perf/util/trace-event-info.c +2 -2
@@ -408,7 +408,7 @@ get_tracepoints_path(struct list_head *pattrs)struct evsel *pos;int nr_tracepoints =0 ; -list_for_each_entry (pos, pattrs, node) { +list_for_each_entry (pos, pattrs, core.node) {if (pos->attr.type !=PERF_TYPE_TRACEPOINT )continue ; ++nr_tracepoints;
@@ -443,7 +443,7 @@ bool have_tracepoints(struct list_head *pattrs) {struct evsel *pos; -list_for_each_entry (pos, pattrs, node) +list_for_each_entry (pos, pattrs, core.node)if (pos->attr.type ==PERF_TYPE_TRACEPOINT )return true;
Signature · 1 line
2.21.0
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Include perf_evsel in evsel object
libperf: Include perf_evsel in evsel object
Commit-ID: b27c4ece725a7f2225f76ad05dc6f3f5463fe893 Gitweb: https://git.kernel.org/tip/b27c4ece725a7f2225f76ad05dc6f3f5463fe893 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:22 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Include perf_evsel in evsel object
Including perf_evsel in evsel object, will continue to move other generic things into libperf's perf_evsel struct.
--- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/ui/browsers/hists.c | 8 ++++---- tools/perf/util/evlist.c | 16 ++++++++-------- tools/perf/util/evlist.h | 12 ++++++------ tools/perf/util/evsel.c | 4 ++-- tools/perf/util/evsel.h | 16 ++++++++-------- tools/perf/util/parse-events.c | 20 ++++++++++---------- tools/perf/util/stat-display.c | 4 ++-- tools/perf/util/trace-event-info.c | 4 ++-- 10 files changed, 44 insertions(+), 44 deletions(-)
tools/perf/builtin-sched.c +1 -1
@@ -2929,7 +2929,7 @@ static int timehist_check_attr(struct perf_sched *sched,struct evsel *evsel;struct evsel_runtime *er; -list_for_each_entry (evsel, &evlist->entries, node) { +list_for_each_entry (evsel, &evlist->entries, core.node) { er =perf_evsel__get_runtime (evsel);if (er ==NULL ) {pr_err ("Failed to allocate memory for evsel runtime data\n" );
tools/perf/builtin-trace.c +1 -1
@@ -2636,7 +2636,7 @@ static bool evlist__add_vfs_getname(struct evlist *evlist)continue ; } -list_del_init (&evsel->node); +list_del_init (&evsel->core.node); evsel->evlist =NULL ;evsel__delete (evsel); }
tools/perf/ui/browsers/hists.c +4 -4
@@ -3212,7 +3212,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, {struct evsel_menu *menu =container_of (browser, struct evsel_menu, b); - struct evsel *evsel = list_entry(entry, struct evsel, node); + struct evsel *evsel = list_entry(entry, struct evsel, core.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 ];
@@ -3309,13 +3309,13 @@ browse_hists:ui_browser__show_title (&menu->b, title);switch (key) {case K_TAB : -if (pos->node.next == &evlist->entries) +if (pos->core.node.next == &evlist->entries) pos =perf_evlist__first (evlist);else pos =perf_evsel__next (pos); goto browse_hists;case K_UNTAB : -if (pos->node.prev == &evlist->entries) +if (pos->core.node.prev == &evlist->entries) pos =perf_evlist__last (evlist);else pos =perf_evsel__prev (pos);
@@ -3351,7 +3351,7 @@ out:static bool filter_group_entries (struct ui_browser *browser__maybe_unused ,void *entry) { - struct evsel *evsel = list_entry(entry, struct evsel, node); + struct evsel *evsel = list_entry(entry, struct evsel, core.node);if (symbol_conf.event_group && !perf_evsel__is_group_leader (evsel))return true;
tools/perf/util/evlist.c +8 -8
@@ -119,7 +119,7 @@ static void perf_evlist__purge(struct evlist *evlist)struct evsel *pos, *n;evlist__for_each_entry_safe (evlist, n, pos) { -list_del_init (&pos->node); +list_del_init (&pos->core.node); pos->evlist =NULL ;evsel__delete (pos); }
@@ -180,7 +180,7 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { entry->evlist = evlist; -list_add_tail (&entry->node, &evlist->entries); +list_add_tail (&entry->core.node, &evlist->entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
@@ -193,7 +193,7 @@ void evlist__add(struct evlist *evlist, struct evsel *entry)void evlist__remove (struct evlist *evlist,struct evsel *evsel) { evsel->evlist =NULL ; -list_del_init (&evsel->node); +list_del_init (&evsel->core.node); evlist->nr_entries -=1 ; }
@@ -203,7 +203,7 @@ void perf_evlist__splice_list_tail(struct evlist *evlist,struct evsel *evsel, *temp;__evlist__for_each_entry_safe (list, temp, evsel) { -list_del_init (&evsel->node); +list_del_init (&evsel->core.node);evlist__add (evlist, evsel); } }
@@ -212,8 +212,8 @@ void __perf_evlist__set_leader(struct list_head *list) {struct evsel *evsel, *leader; - leader = list_entry(list->next, struct evsel, node); - evsel = list_entry(list->prev, struct evsel, node); + leader = list_entry(list->next, struct evsel, core.node); + evsel = list_entry(list->prev, struct evsel, core.node); leader->nr_members = evsel->idx - leader->idx +1 ;
@@ -268,7 +268,7 @@ static int evlist__add_attrs(struct evlist *evlist, evsel =perf_evsel__new_idx (attrs + i, evlist->nr_entries + i);if (evsel ==NULL ) goto out_delete_partial_list; -list_add_tail (&evsel->node, &head); +list_add_tail (&evsel->core.node, &head); }perf_evlist__splice_list_tail (evlist, &head);
@@ -1680,7 +1680,7 @@ void perf_evlist__to_front(struct evlist *evlist,evlist__for_each_entry_safe (evlist, n, evsel) {if (evsel->leader == move_evsel->leader) -list_move_tail (&evsel->node, &move); +list_move_tail (&evsel->core.node, &move); }list_splice (&move, &evlist->entries);
tools/perf/util/evlist.h +6 -6
@@ -230,12 +230,12 @@ static inline bool perf_evlist__empty(struct evlist *evlist)static inline struct evsel *perf_evlist__first (struct evlist *evlist) { - return list_entry(evlist->entries.next, struct evsel, node); + return list_entry(evlist->entries.next, struct evsel, core.node); }static inline struct evsel *perf_evlist__last (struct evlist *evlist) { - return list_entry(evlist->entries.prev, struct evsel, node); + return list_entry(evlist->entries.prev, struct evsel, core.node); }size_t perf_evlist__fprintf (struct evlist *evlist,FILE *fp);
@@ -253,7 +253,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry (list, evsel) \ - list_for_each_entry(evsel, list, node) + list_for_each_entry(evsel, list, core.node)/** * evlist__for_each_entry - iterate thru all the evsels
@@ -269,7 +269,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry_continue (list, evsel) \ - list_for_each_entry_continue(evsel, list, node) + list_for_each_entry_continue(evsel, list, core.node)/** * evlist__for_each_entry_continue - continue iteration thru all the evsels
@@ -285,7 +285,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry_reverse (list, evsel) \ - list_for_each_entry_reverse(evsel, list, node) + list_for_each_entry_reverse(evsel, list, core.node)/** * evlist__for_each_entry_reverse - iterate thru all the evsels in reverse order
@@ -302,7 +302,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define __evlist__for_each_entry_safe (list, tmp, evsel) \ - list_for_each_entry_safe(evsel, tmp, list, node) + list_for_each_entry_safe(evsel, tmp, list, core.node)/** * evlist__for_each_entry_safe - safely iterate thru all the evsels
tools/perf/util/evsel.c +2 -2
@@ -236,7 +236,7 @@ void evsel__init(struct evsel *evsel, evsel->evlist =NULL ; evsel->bpf_obj =NULL ; evsel->bpf_fd =-1 ; -INIT_LIST_HEAD (&evsel->node); +INIT_LIST_HEAD (&evsel->core.node);INIT_LIST_HEAD (&evsel->config_terms); perf_evsel__object.init (evsel); evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);
@@ -1318,7 +1318,7 @@ void perf_evsel__close_fd(struct evsel *evsel)void perf_evsel__exit (struct evsel *evsel) { -assert (list_empty (&evsel->node)); +assert (list_empty (&evsel->core.node));assert (evsel->evlist ==NULL );perf_evsel__free_counts (evsel);perf_evsel__free_fd (evsel);
tools/perf/util/evsel.h +8 -8
@@ -7,6 +7,7 @@#include <stddef.h> #include <linux/perf_event.h> #include <linux/types.h> +#include <internal/evsel.h> #include "xyarray.h" #include "symbol_conf.h" #include "cpumap.h"
@@ -87,8 +88,7 @@ struct bpf_object;/** struct evsel - event selector * * @evlist - evlist this evsel is in, if it is in one. -* @node - To insert it into evlist->entries or in other list_heads, say in -* the event parsing routines. +* @core - libperf evsel object * @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.
@@ -101,7 +101,7 @@ struct bpf_object;* @priv: And what is in its containing unnamed union are tool specific */ struct evsel { -struct list_head node; +struct perf_evsel core;struct evlist *evlist;struct perf_event_attr attr;char *filter;
@@ -386,12 +386,12 @@ int perf_evsel__parse_sample_timestamp(struct evsel *evsel,static inline struct evsel *perf_evsel__next (struct evsel *evsel) { - return list_entry(evsel->node.next, struct evsel, node); + return list_entry(evsel->core.node.next, struct evsel, core.node); }static inline struct evsel *perf_evsel__prev (struct evsel *evsel) { - return list_entry(evsel->node.prev, struct evsel, node); + return list_entry(evsel->core.node.prev, struct evsel, core.node); }/**
@@ -478,15 +478,15 @@ static inline int perf_evsel__group_idx(struct evsel *evsel)/* Iterates group WITHOUT the leader. */ #define for_each_group_member (_evsel, _leader) \ -for ((_evsel) = list_entry((_leader)->node.next, struct evsel, node); \ +for ((_evsel) = list_entry((_leader)->core.node.next, struct evsel, core.node); \ (_evsel) && (_evsel)->leader == (_leader); \ - (_evsel) = list_entry((_evsel)->node.next, struct evsel, node)) + (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node))/* Iterates group WITH the leader. */ #define for_each_group_evsel (_evsel, _leader) \ for ((_evsel) = _leader; \ (_evsel) && (_evsel)->leader == (_leader); \ - (_evsel) = list_entry((_evsel)->node.next, struct evsel, node)) + (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node))static inline bool perf_evsel__has_branch_callstack (const struct evsel *evsel) {
tools/perf/util/parse-events.c +10 -10
@@ -343,7 +343,7 @@ __add_event(struct list_head *list, int *idx,if (config_terms)list_splice (config_terms, &evsel->config_terms); -list_add_tail (&evsel->node, list); +list_add_tail (&evsel->core.node, list);return evsel; }
@@ -526,7 +526,7 @@ static int add_tracepoint(struct list_head *list, int *idx,list_splice (&config_terms, &evsel->config_terms); } -list_add_tail (&evsel->node, list); +list_add_tail (&evsel->core.node, list);return 0 ; }
@@ -660,15 +660,15 @@ static int add_bpf_event(const char *group, const char *event, int fd, struct bppr_debug ("Failed to add BPF event %s:%s\n" , group, event); -list_for_each_entry_safe (evsel, tmp, &new_evsels, node) { -list_del_init (&evsel->node); +list_for_each_entry_safe (evsel, tmp, &new_evsels, core.node) { +list_del_init (&evsel->core.node);evsel__delete (evsel); }return err; }pr_debug ("adding %s:%s\n" , group, event); -list_for_each_entry (pos, &new_evsels, node) { +list_for_each_entry (pos, &new_evsels, core.node) {pr_debug ("adding %s:%s to %p\n" , group, event, pos); pos->bpf_fd = fd;
@@ -1458,8 +1458,8 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,bool is_leader = true;int i, nr_pmu =0 , total_members, ret =0 ; - leader = list_first_entry(list, struct evsel, node); - evsel = list_last_entry(list, struct evsel, node); + leader = list_first_entry(list, struct evsel, core.node); + evsel = list_last_entry(list, struct evsel, core.node); total_members = evsel->idx - leader->idx +1 ; leaders =calloc (total_members,sizeof (uintptr_t ));
@@ -1555,7 +1555,7 @@ void parse_events__set_leader(char *name, struct list_head *list,return ;__perf_evlist__set_leader (list); - leader = list_entry(list->next, struct evsel, node); + leader = list_entry(list->next, struct evsel, core.node); leader->group_name = name ?strdup (name) :NULL ; }
@@ -2050,9 +2050,9 @@ foreach_evsel_in_last_glob(struct evlist *evlist,if (!last)return 0 ; -if (last->node.prev == &evlist->entries) +if (last->core.node.prev == &evlist->entries)return 0 ; - last = list_entry(last->node.prev, struct evsel, node); + last = list_entry(last->core.node.prev, struct evsel, core.node); }while (!last->cmdline_group_boundary);return 0 ;
tools/perf/util/stat-display.c +2 -2
@@ -548,8 +548,8 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *cstruct evlist *evlist = counter->evlist;struct evsel *alias; - alias =list_prepare_entry (counter, &(evlist->entries), node); - list_for_each_entry_continue (alias, &evlist->entries, node) { + alias =list_prepare_entry (counter, &(evlist->entries), core.node); + list_for_each_entry_continue (alias, &evlist->entries, core.node) { if (strcmp(perf_evsel__name(alias), perf_evsel__name(counter)) || alias->scale != counter->scale || alias->cgrp != counter->cgrp ||
tools/perf/util/trace-event-info.c +2 -2
@@ -408,7 +408,7 @@ get_tracepoints_path(struct list_head *pattrs)struct evsel *pos;int nr_tracepoints =0 ; -list_for_each_entry (pos, pattrs, node) { +list_for_each_entry (pos, pattrs, core.node) {if (pos->attr.type !=PERF_TYPE_TRACEPOINT )continue ; ++nr_tracepoints;
@@ -443,7 +443,7 @@ bool have_tracepoints(struct list_head *pattrs) {struct evsel *pos; -list_for_each_entry (pos, pattrs, node) +list_for_each_entry (pos, pattrs, core.node)if (pos->attr.type ==PERF_TYPE_TRACEPOINT )return true;
Jiri Olsa
reviewerPATCH 36/79 libperf: Include perf_evlist in evlist object
In reply to Jiri OlsaIncluding perf_evlist in evlist object, will continue to move other generic things into libperf evlist.
--- tools/perf/builtin-record.c | 4 ++-- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/ui/browsers/hists.c | 6 +++--- tools/perf/util/cgroup.c | 2 +- tools/perf/util/evlist.c | 8 ++++---- tools/perf/util/evlist.h | 17 +++++++++-------- tools/perf/util/header.c | 4 ++-- tools/perf/util/parse-events.c | 2 +- tools/perf/util/stat-display.c | 4 ++-- 10 files changed, 26 insertions(+), 25 deletions(-)
tools/perf/builtin-record.c +2 -2
@@ -1002,7 +1002,7 @@ static void record__init_features(struct record *rec)if (rec->no_buildid)perf_header__clear_feat (&session->header,HEADER_BUILD_ID ); -if (!have_tracepoints (&rec->evlist->entries)) +if (!have_tracepoints (&rec->evlist->core.entries))perf_header__clear_feat (&session->header,HEADER_TRACING_DATA );if (!rec->opts.branch_stack)
@@ -1218,7 +1218,7 @@ static int record__synthesize(struct record *rec, bool tail)return err; } -if (have_tracepoints (&rec->evlist->entries)) { +if (have_tracepoints (&rec->evlist->core.entries)) {/* * FIXME err <= 0 here actually means that * there were no tracepoints so its not really
tools/perf/builtin-sched.c +1 -1
@@ -2929,7 +2929,7 @@ static int timehist_check_attr(struct perf_sched *sched,struct evsel *evsel;struct evsel_runtime *er; -list_for_each_entry (evsel, &evlist->entries, core.node) { +list_for_each_entry (evsel, &evlist->core.entries, core.node) { er =perf_evsel__get_runtime (evsel);if (er ==NULL ) {pr_err ("Failed to allocate memory for evsel runtime data\n" );
tools/perf/builtin-trace.c +1 -1
@@ -3979,7 +3979,7 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int u {struct trace *trace = opt->value; -if (!list_empty (&trace->evlist->entries)) +if (!list_empty (&trace->evlist->core.entries))return parse_cgroups (opt, str, unset); trace->cgroup =evlist__findnew_cgroup (trace->evlist, str);
tools/perf/ui/browsers/hists.c +3 -3
@@ -3309,13 +3309,13 @@ static int perf_evsel_menu__run(struct evsel_menu *menu,ui_browser__show_title (&menu->b, title);switch (key) {case K_TAB : -if (pos->core.node.next == &evlist->entries) +if (pos->core.node.next == &evlist->core.entries) pos =perf_evlist__first (evlist);else pos =perf_evsel__next (pos); goto browse_hists;case K_UNTAB : -if (pos->core.node.prev == &evlist->entries) +if (pos->core.node.prev == &evlist->core.entries) pos =perf_evlist__last (evlist);else pos =perf_evsel__prev (pos);
@@ -3370,7 +3370,7 @@ static int __perf_evlist__tui_browse_hists(struct evlist *evlist,struct evsel *pos;struct evsel_menu menu = { .b = { - .entries = &evlist->entries, + .entries = &evlist->core.entries, .refresh = ui_browser__list_head_refresh, .seek = ui_browser__list_head_seek, .write = perf_evsel_menu__write,
tools/perf/util/cgroup.c +1 -1
@@ -208,7 +208,7 @@ int parse_cgroups(const struct option *opt, const char *str,char *s;int ret, i; -if (list_empty (&evlist->entries)) { +if (list_empty (&evlist->core.entries)) {fprintf (stderr,"must define events before cgroups\n" );return -1 ; }
tools/perf/util/evlist.c +4 -4
@@ -48,7 +48,7 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,for (i =0 ; i <PERF_EVLIST__HLIST_SIZE ; ++i)INIT_HLIST_HEAD (&evlist->heads[i]); -INIT_LIST_HEAD (&evlist->entries); +INIT_LIST_HEAD (&evlist->core.entries);perf_evlist__set_maps (evlist, cpus, threads);fdarray__init (&evlist->pollfd,64 ); evlist->workload.pid =-1 ;
@@ -180,7 +180,7 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { entry->evlist = evlist; -list_add_tail (&entry->core.node, &evlist->entries); +list_add_tail (&entry->core.node, &evlist->core.entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
@@ -226,7 +226,7 @@ void perf_evlist__set_leader(struct evlist *evlist) {if (evlist->nr_entries) { evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ; -__perf_evlist__set_leader (&evlist->entries); +__perf_evlist__set_leader (&evlist->core.entries); } }
@@ -1683,7 +1683,7 @@ void perf_evlist__to_front(struct evlist *evlist,list_move_tail (&evsel->core.node, &move); } -list_splice (&move, &evlist->entries); +list_splice (&move, &evlist->core.entries); } void perf_evlist__set_tracking_event(struct evlist *evlist,
tools/perf/util/evlist.h +9 -8
@@ -8,6 +8,7 @@#include <linux/list.h> #include <api/fd/array.h> #include <stdio.h> +#include <internal/evlist.h> #include "../perf.h" #include "event.h" #include "evsel.h"
@@ -25,7 +26,7 @@ struct record_opts;#define PERF_EVLIST__HLIST_SIZE (1 << PERF_EVLIST__HLIST_BITS)struct evlist { -struct list_head entries; +struct perf_evlist core;struct hlist_head heads[PERF_EVLIST__HLIST_SIZE ];int nr_entries;int nr_groups;
@@ -225,17 +226,17 @@ void perf_evlist__splice_list_tail(struct evlist *evlist,static inline bool perf_evlist__empty (struct evlist *evlist) { -return list_empty (&evlist->entries); +return list_empty (&evlist->core.entries); }static inline struct evsel *perf_evlist__first (struct evlist *evlist) { - return list_entry(evlist->entries.next, struct evsel, core.node); + return list_entry(evlist->core.entries.next, struct evsel, core.node); }static inline struct evsel *perf_evlist__last (struct evlist *evlist) { - return list_entry(evlist->entries.prev, struct evsel, core.node); + return list_entry(evlist->core.entries.prev, struct evsel, core.node); }size_t perf_evlist__fprintf (struct evlist *evlist,FILE *fp);
@@ -261,7 +262,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define evlist__for_each_entry (evlist, evsel) \ - __evlist__for_each_entry(&(evlist)->entries, evsel) + __evlist__for_each_entry(&(evlist)->core.entries, evsel)/** * __evlist__for_each_entry_continue - continue iteration thru all the evsels
@@ -277,7 +278,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define evlist__for_each_entry_continue (evlist, evsel) \ - __evlist__for_each_entry_continue(&(evlist)->entries, evsel) + __evlist__for_each_entry_continue(&(evlist)->core.entries, evsel)/** * __evlist__for_each_entry_reverse - iterate thru all the evsels in reverse order
@@ -293,7 +294,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define evlist__for_each_entry_reverse (evlist, evsel) \ - __evlist__for_each_entry_reverse(&(evlist)->entries, evsel) + __evlist__for_each_entry_reverse(&(evlist)->core.entries, evsel)/** * __evlist__for_each_entry_safe - safely iterate thru all the evsels
@@ -311,7 +312,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @tmp: struct evsel temp iterator */ #define evlist__for_each_entry_safe (evlist, tmp, evsel) \ - __evlist__for_each_entry_safe(&(evlist)->entries, tmp, evsel) + __evlist__for_each_entry_safe(&(evlist)->core.entries, tmp, evsel)void perf_evlist__set_tracking_event (struct evlist *evlist,struct evsel *tracking_evsel);
tools/perf/util/header.c +2 -2
@@ -304,7 +304,7 @@ static int write_tracing_data(struct feat_fd *ff,if (WARN (ff->buf,"Error: calling %s in pipe-mode.\n" , __func__))return -1 ; -return read_tracing_data (ff->fd, &evlist->entries); +return read_tracing_data (ff->fd, &evlist->core.entries); } static int write_build_id(struct feat_fd *ff,
@@ -4105,7 +4105,7 @@ int perf_event__synthesize_tracing_data(struct perf_tool *tool, int fd,* - write the tracing data from the temp file * to the pipe */ - tdata =tracing_data_get (&evlist->entries, fd, true); + tdata =tracing_data_get (&evlist->core.entries, fd, true);if (!tdata)return -1 ;
tools/perf/util/parse-events.c +1 -1
@@ -2050,7 +2050,7 @@ foreach_evsel_in_last_glob(struct evlist *evlist,if (!last)return 0 ; -if (last->core.node.prev == &evlist->entries) +if (last->core.node.prev == &evlist->core.entries)return 0 ; last = list_entry(last->core.node.prev, struct evsel, core.node); }while (!last->cmdline_group_boundary);
tools/perf/util/stat-display.c +2 -2
@@ -548,8 +548,8 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *cstruct evlist *evlist = counter->evlist;struct evsel *alias; - alias =list_prepare_entry (counter, &(evlist->entries), core.node); - list_for_each_entry_continue (alias, &evlist->entries, core.node) { + alias =list_prepare_entry (counter, &(evlist->core.entries), core.node); + list_for_each_entry_continue (alias, &evlist->core.entries, core.node) { if (strcmp(perf_evsel__name(alias), perf_evsel__name(counter)) || alias->scale != counter->scale || alias->cgrp != counter->cgrp ||
Signature · 1 line
2.21.0
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Include perf_evlist in evlist object
libperf: Include perf_evlist in evlist object
Commit-ID: ce9036a6e3bdfac6c7ccf8221aec9bcf9c2d355e Gitweb: https://git.kernel.org/tip/ce9036a6e3bdfac6c7ccf8221aec9bcf9c2d355e Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:23 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Include perf_evlist in evlist object
Include perf_evlist in the evlist object, will continue to move other generic things into libperf's perf_evlist.
--- tools/perf/builtin-record.c | 4 ++-- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-trace.c | 2 +- tools/perf/ui/browsers/hists.c | 6 +++--- tools/perf/util/cgroup.c | 2 +- tools/perf/util/evlist.c | 8 ++++---- tools/perf/util/evlist.h | 17 +++++++++-------- tools/perf/util/header.c | 4 ++-- tools/perf/util/parse-events.c | 2 +- tools/perf/util/stat-display.c | 4 ++-- 10 files changed, 26 insertions(+), 25 deletions(-)
tools/perf/builtin-record.c +2 -2
@@ -1002,7 +1002,7 @@ static void record__init_features(struct record *rec)if (rec->no_buildid)perf_header__clear_feat (&session->header,HEADER_BUILD_ID ); -if (!have_tracepoints (&rec->evlist->entries)) +if (!have_tracepoints (&rec->evlist->core.entries))perf_header__clear_feat (&session->header,HEADER_TRACING_DATA );if (!rec->opts.branch_stack)
@@ -1218,7 +1218,7 @@ static int record__synthesize(struct record *rec, bool tail)return err; } -if (have_tracepoints (&rec->evlist->entries)) { +if (have_tracepoints (&rec->evlist->core.entries)) {/* * FIXME err <= 0 here actually means that * there were no tracepoints so its not really
tools/perf/builtin-sched.c +1 -1
@@ -2929,7 +2929,7 @@ static int timehist_check_attr(struct perf_sched *sched,struct evsel *evsel;struct evsel_runtime *er; -list_for_each_entry (evsel, &evlist->entries, core.node) { +list_for_each_entry (evsel, &evlist->core.entries, core.node) { er =perf_evsel__get_runtime (evsel);if (er ==NULL ) {pr_err ("Failed to allocate memory for evsel runtime data\n" );
tools/perf/builtin-trace.c +1 -1
@@ -3980,7 +3980,7 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int u {struct trace *trace = opt->value; -if (!list_empty (&trace->evlist->entries)) +if (!list_empty (&trace->evlist->core.entries))return parse_cgroups (opt, str, unset); trace->cgroup =evlist__findnew_cgroup (trace->evlist, str);
tools/perf/ui/browsers/hists.c +3 -3
@@ -3309,13 +3309,13 @@ browse_hists:ui_browser__show_title (&menu->b, title);switch (key) {case K_TAB : -if (pos->core.node.next == &evlist->entries) +if (pos->core.node.next == &evlist->core.entries) pos =perf_evlist__first (evlist);else pos =perf_evsel__next (pos); goto browse_hists;case K_UNTAB : -if (pos->core.node.prev == &evlist->entries) +if (pos->core.node.prev == &evlist->core.entries) pos =perf_evlist__last (evlist);else pos =perf_evsel__prev (pos);
@@ -3370,7 +3370,7 @@ static int __perf_evlist__tui_browse_hists(struct evlist *evlist,struct evsel *pos;struct evsel_menu menu = { .b = { - .entries = &evlist->entries, + .entries = &evlist->core.entries, .refresh = ui_browser__list_head_refresh, .seek = ui_browser__list_head_seek, .write = perf_evsel_menu__write,
tools/perf/util/cgroup.c +1 -1
@@ -208,7 +208,7 @@ int parse_cgroups(const struct option *opt, const char *str,char *s;int ret, i; -if (list_empty (&evlist->entries)) { +if (list_empty (&evlist->core.entries)) {fprintf (stderr,"must define events before cgroups\n" );return -1 ; }
tools/perf/util/evlist.c +4 -4
@@ -48,7 +48,7 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,for (i =0 ; i <PERF_EVLIST__HLIST_SIZE ; ++i)INIT_HLIST_HEAD (&evlist->heads[i]); -INIT_LIST_HEAD (&evlist->entries); +INIT_LIST_HEAD (&evlist->core.entries);perf_evlist__set_maps (evlist, cpus, threads);fdarray__init (&evlist->pollfd,64 ); evlist->workload.pid =-1 ;
@@ -180,7 +180,7 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { entry->evlist = evlist; -list_add_tail (&entry->core.node, &evlist->entries); +list_add_tail (&entry->core.node, &evlist->core.entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
@@ -226,7 +226,7 @@ void perf_evlist__set_leader(struct evlist *evlist) {if (evlist->nr_entries) { evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ; -__perf_evlist__set_leader (&evlist->entries); +__perf_evlist__set_leader (&evlist->core.entries); } }
@@ -1683,7 +1683,7 @@ void perf_evlist__to_front(struct evlist *evlist,list_move_tail (&evsel->core.node, &move); } -list_splice (&move, &evlist->entries); +list_splice (&move, &evlist->core.entries); } void perf_evlist__set_tracking_event(struct evlist *evlist,
tools/perf/util/evlist.h +9 -8
@@ -8,6 +8,7 @@#include <linux/list.h> #include <api/fd/array.h> #include <stdio.h> +#include <internal/evlist.h> #include "../perf.h" #include "event.h" #include "evsel.h"
@@ -25,7 +26,7 @@ struct record_opts;#define PERF_EVLIST__HLIST_SIZE (1 << PERF_EVLIST__HLIST_BITS)struct evlist { -struct list_head entries; +struct perf_evlist core;struct hlist_head heads[PERF_EVLIST__HLIST_SIZE ];int nr_entries;int nr_groups;
@@ -225,17 +226,17 @@ void perf_evlist__splice_list_tail(struct evlist *evlist,static inline bool perf_evlist__empty (struct evlist *evlist) { -return list_empty (&evlist->entries); +return list_empty (&evlist->core.entries); }static inline struct evsel *perf_evlist__first (struct evlist *evlist) { - return list_entry(evlist->entries.next, struct evsel, core.node); + return list_entry(evlist->core.entries.next, struct evsel, core.node); }static inline struct evsel *perf_evlist__last (struct evlist *evlist) { - return list_entry(evlist->entries.prev, struct evsel, core.node); + return list_entry(evlist->core.entries.prev, struct evsel, core.node); }size_t perf_evlist__fprintf (struct evlist *evlist,FILE *fp);
@@ -261,7 +262,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define evlist__for_each_entry (evlist, evsel) \ - __evlist__for_each_entry(&(evlist)->entries, evsel) + __evlist__for_each_entry(&(evlist)->core.entries, evsel)/** * __evlist__for_each_entry_continue - continue iteration thru all the evsels
@@ -277,7 +278,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define evlist__for_each_entry_continue (evlist, evsel) \ - __evlist__for_each_entry_continue(&(evlist)->entries, evsel) + __evlist__for_each_entry_continue(&(evlist)->core.entries, evsel)/** * __evlist__for_each_entry_reverse - iterate thru all the evsels in reverse order
@@ -293,7 +294,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @evsel: struct evsel iterator */ #define evlist__for_each_entry_reverse (evlist, evsel) \ - __evlist__for_each_entry_reverse(&(evlist)->entries, evsel) + __evlist__for_each_entry_reverse(&(evlist)->core.entries, evsel)/** * __evlist__for_each_entry_safe - safely iterate thru all the evsels
@@ -311,7 +312,7 @@ void perf_evlist__to_front(struct evlist *evlist,* @tmp: struct evsel temp iterator */ #define evlist__for_each_entry_safe (evlist, tmp, evsel) \ - __evlist__for_each_entry_safe(&(evlist)->entries, tmp, evsel) + __evlist__for_each_entry_safe(&(evlist)->core.entries, tmp, evsel)void perf_evlist__set_tracking_event (struct evlist *evlist,struct evsel *tracking_evsel);
tools/perf/util/header.c +2 -2
@@ -304,7 +304,7 @@ static int write_tracing_data(struct feat_fd *ff,if (WARN (ff->buf,"Error: calling %s in pipe-mode.\n" , __func__))return -1 ; -return read_tracing_data (ff->fd, &evlist->entries); +return read_tracing_data (ff->fd, &evlist->core.entries); } static int write_build_id(struct feat_fd *ff,
@@ -4112,7 +4112,7 @@ int perf_event__synthesize_tracing_data(struct perf_tool *tool, int fd,* - write the tracing data from the temp file * to the pipe */ - tdata =tracing_data_get (&evlist->entries, fd, true); + tdata =tracing_data_get (&evlist->core.entries, fd, true);if (!tdata)return -1 ;
tools/perf/util/parse-events.c +1 -1
@@ -2050,7 +2050,7 @@ foreach_evsel_in_last_glob(struct evlist *evlist,if (!last)return 0 ; -if (last->core.node.prev == &evlist->entries) +if (last->core.node.prev == &evlist->core.entries)return 0 ; last = list_entry(last->core.node.prev, struct evsel, core.node); }while (!last->cmdline_group_boundary);
tools/perf/util/stat-display.c +2 -2
@@ -548,8 +548,8 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *cstruct evlist *evlist = counter->evlist;struct evsel *alias; - alias =list_prepare_entry (counter, &(evlist->entries), core.node); - list_for_each_entry_continue (alias, &evlist->entries, core.node) { + alias =list_prepare_entry (counter, &(evlist->core.entries), core.node); + list_for_each_entry_continue (alias, &evlist->core.entries, core.node) { if (strcmp(perf_evsel__name(alias), perf_evsel__name(counter)) || alias->scale != counter->scale || alias->cgrp != counter->cgrp ||
Jiri Olsa
reviewerPATCH 37/79 libperf: Add perf_evsel__init function
In reply to Jiri OlsaAdding perf_evsel__init function to initializeperf_evsel struct.
--- tools/perf/lib/evsel.c | 5 +++++ tools/perf/lib/include/perf/evsel.h | 4 ++++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evsel.c | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-)
tools/perf/lib/evsel.c +5 -0
@@ -2,3 +2,8 @@#include <perf/evsel.h> #include <linux/list.h> #include <internal/evsel.h> + +void perf_evsel__init (struct perf_evsel *evsel) +{ +INIT_LIST_HEAD (&evsel->node); +}
tools/perf/lib/include/perf/evsel.h +4 -0
@@ -2,6 +2,10 @@#ifndef __LIBPERF_EVSEL_H#define __LIBPERF_EVSEL_H +#include <perf/core.h> +struct perf_evsel ; +LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel); +#endif /* __LIBPERF_EVSEL_H */
tools/perf/lib/libperf.map +1 -0
@@ -9,6 +9,7 @@ LIBPERF_0.0.1 { perf_thread_map__comm; perf_thread_map__get; perf_thread_map__put; + perf_evsel__init; local: *; };
tools/perf/util/evsel.c +2 -1
@@ -22,6 +22,7 @@#include <sys/resource.h> #include <sys/types.h> #include <dirent.h> +#include <perf/evsel.h> #include "asm/bug.h" #include "callchain.h" #include "cgroup.h"
@@ -226,6 +227,7 @@ bool perf_evsel__is_function_event(struct evsel *evsel)void evsel__init (struct evsel *evsel,struct perf_event_attr *attr,int idx) { +perf_evsel__init (&evsel->core); evsel->idx = idx; evsel->tracking = !idx; evsel->attr = *attr;
@@ -236,7 +238,6 @@ void evsel__init(struct evsel *evsel, evsel->evlist =NULL ; evsel->bpf_obj =NULL ; evsel->bpf_fd =-1 ; -INIT_LIST_HEAD (&evsel->core.node);INIT_LIST_HEAD (&evsel->config_terms); perf_evsel__object.init (evsel); evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);
Signature · 1 line
2.21.0
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Add perf_evsel__init function
libperf: Add perf_evsel__init function
Commit-ID: b04c597af761ccfd32f40ee3629843b6f3674fce Gitweb: https://git.kernel.org/tip/b04c597af761ccfd32f40ee3629843b6f3674fce Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:24 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Add perf_evsel__init function
Add the perf_evsel__init() function to initialize perf_evsel struct.
--- tools/perf/lib/evsel.c | 5 +++++ tools/perf/lib/include/perf/evsel.h | 4 ++++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evsel.c | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-)
tools/perf/lib/evsel.c +5 -0
@@ -2,3 +2,8 @@#include <perf/evsel.h> #include <linux/list.h> #include <internal/evsel.h> + +void perf_evsel__init (struct perf_evsel *evsel) +{ +INIT_LIST_HEAD (&evsel->node); +}
tools/perf/lib/include/perf/evsel.h +4 -0
@@ -2,6 +2,10 @@#ifndef __LIBPERF_EVSEL_H#define __LIBPERF_EVSEL_H +#include <perf/core.h> +struct perf_evsel ; +LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel); +#endif /* __LIBPERF_EVSEL_H */
tools/perf/lib/libperf.map +1 -0
@@ -9,6 +9,7 @@ LIBPERF_0.0.1 { perf_thread_map__comm; perf_thread_map__get; perf_thread_map__put; + perf_evsel__init; local: *; };
tools/perf/util/evsel.c +2 -1
@@ -22,6 +22,7 @@#include <sys/resource.h> #include <sys/types.h> #include <dirent.h> +#include <perf/evsel.h> #include "asm/bug.h" #include "callchain.h" #include "cgroup.h"
@@ -226,6 +227,7 @@ bool perf_evsel__is_function_event(struct evsel *evsel)void evsel__init (struct evsel *evsel,struct perf_event_attr *attr,int idx) { +perf_evsel__init (&evsel->core); evsel->idx = idx; evsel->tracking = !idx; evsel->attr = *attr;
@@ -236,7 +238,6 @@ void evsel__init(struct evsel *evsel, evsel->evlist =NULL ; evsel->bpf_obj =NULL ; evsel->bpf_fd =-1 ; -INIT_LIST_HEAD (&evsel->core.node);INIT_LIST_HEAD (&evsel->config_terms); perf_evsel__object.init (evsel); evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);
Jiri Olsa
reviewerPATCH 38/79 libperf: Add perf_evlist__init function
In reply to Jiri OlsaAdding perf_evlist__init function to initializeperf_evlist struct.
--- tools/perf/lib/evlist.c | 5 +++++ tools/perf/lib/include/perf/evlist.h | 4 ++++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-)
tools/perf/lib/evlist.c +5 -0
@@ -2,3 +2,8 @@#include <perf/evlist.h> #include <linux/list.h> #include <internal/evlist.h> + +void perf_evlist__init (struct perf_evlist *evlist) +{ +INIT_LIST_HEAD (&evlist->entries); +}
tools/perf/lib/include/perf/evlist.h +4 -0
@@ -2,6 +2,10 @@#ifndef __LIBPERF_EVLIST_H#define __LIBPERF_EVLIST_H +#include <perf/core.h> +struct perf_evlist ; +LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); +#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/libperf.map +1 -0
@@ -10,6 +10,7 @@ LIBPERF_0.0.1 { perf_thread_map__get; perf_thread_map__put; perf_evsel__init; + perf_evlist__init; local: *; };
tools/perf/util/evlist.c +2 -1
@@ -33,6 +33,7 @@#include <linux/log2.h> #include <linux/err.h> #include <linux/zalloc.h> +#include <perf/evlist.h> #ifdef LACKS_SIGQUEUE_PROTOTYPE int sigqueue (pid_t pid,int sig,const union sigval value);
@@ -48,11 +49,11 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,for (i =0 ; i <PERF_EVLIST__HLIST_SIZE ; ++i)INIT_HLIST_HEAD (&evlist->heads[i]); -INIT_LIST_HEAD (&evlist->core.entries);perf_evlist__set_maps (evlist, cpus, threads);fdarray__init (&evlist->pollfd,64 ); evlist->workload.pid =-1 ; evlist->bkw_mmap_state =BKW_MMAP_NOTREADY ; +perf_evlist__init (&evlist->core); }struct evlist *evlist__new (void )
Signature · 1 line
2.21.0
Re: [PATCH 38/79] libperf: Add perf_evlist__init function
Em Sun, Jul 21, 2019 at 01:24:25PM +0200, Jiri Olsa escreveu:
Quoted 65 lines
Adding
perf_evlist__initfunction to initializeperf_evliststruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/lib/evlist.c | 5 +++++ tools/perf/lib/include/perf/evlist.h | 4 ++++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-)tools/perf/lib/evlist.c +5
-0@@ -2,3 +2,8 @@#include <perf/evlist.h> #include <linux/list.h> #include <internal/evlist.h> + +void perf_evlist__init (struct perf_evlist *evlist) +{ +INIT_LIST_HEAD (&evlist->entries); +}tools/perf/lib/include/perf/evlist.h +4
-0@@ -2,6 +2,10 @@#ifndef __LIBPERF_EVLIST_H#define __LIBPERF_EVLIST_H +#include <perf/core.h> +struct perf_evlist ; +LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); +#endif /* __LIBPERF_EVLIST_H */ tools/perf/lib/libperf.map +1
-0@@ -10,6 +10,7 @@ LIBPERF_0.0.1 { perf_thread_map__get; perf_thread_map__put; perf_evsel__init; + perf_evlist__init; local: *; };tools/perf/util/evlist.c +1
-0@@ -33,6 +33,7 @@#include <linux/log2.h> #include <linux/err.h> #include <linux/zalloc.h> +#include <perf/evlist.h> #ifdef LACKS_SIGQUEUE_PROTOTYPE int sigqueue (pid_t pid,int sig,const union sigval value);
tools/perf/util/evlist.c void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, · line 57
Quoted 10 lines
tools/perf/util/evlist.c +1
-1@@ -48,11 +49,11 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,for (i =0 ; i <PERF_EVLIST__HLIST_SIZE ; ++i)INIT_HLIST_HEAD (&evlist->heads[i]); -INIT_LIST_HEAD (&evlist->core.entries);perf_evlist__set_maps (evlist, cpus, threads);fdarray__init (&evlist->pollfd,64 ); evlist->workload.pid =-1 ; evlist->bkw_mmap_state =BKW_MMAP_NOTREADY ; +perf_evlist__init (&evlist->core); }
This causes a segfault, since perf_evlist__set_maps() will touch stuff that you now moved to the end of this function, applying the patch at the end of this message fixes the issue, i.e. keeps the existing init ordering and avoids the segfault:
gdb) run stat sleep 1
Starting program: /root/bin/perf stat sleep 1
Program received signal SIGSEGV, Segmentation fault.0x00000000004f6b55 in __perf_evlist__propagate_maps (evlist=0xbb34c0, evsel=0x0) at util/evlist.c:161
161 if (!evsel->own_cpus || evlist->has_user_cpus) {
Missing separate debuginfos, use: dnf debuginfo-install bzip2-libs-1.0.6-29.fc30.x86_64 elfutils-libelf-0.176-3.fc30.x86_64 elfutils-libs-0.176-3.fc30.x86_64 glib2-2.60.4-1.fc30.x86_64 libbabeltrace-1.5.6-2.fc30.x86_64 libgcc-9.1.1-1.fc30.x86_64 libunwind-1.3.1-2.fc30.x86_64 libuuid-2.33.2-1.fc30.x86_64 libxcrypt-4.4.6-2.fc30.x86_64 libzstd-1.4.0-1.fc30.x86_64 numactl-libs-2.0.12-2.fc30.x86_64 pcre-8.43-2.fc30.x86_64 perl-libs-5.28.2-436.fc30.x86_64 popt-1.16-17.fc30.x86_64 python2-libs-2.7.16-2.fc30.x86_64 slang-2.3.2-5.fc30.x86_64 xz-libs-5.2.4-5.fc30.x86_64 zlib-1.2.11-15.fc30.x86_64 (gdb) bt
#0 0x00000000004f6b55 in __perf_evlist__propagate_maps (evlist=0xbb34c0, evsel=0x0) at util/evlist.c:161 #1 0x00000000004f6c7a in perf_evlist__propagate_maps (evlist=0xbb34c0) at util/evlist.c:178 #2 0x00000000004f955e in perf_evlist__set_maps (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:1128 #3 0x00000000004f66f8 in evlist__init (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:52 #4 0x00000000004f6790 in evlist__new () at util/evlist.c:64 #5 0x0000000000456071 in cmd_stat (argc=3, argv=0x7fffffffd670) at builtin-stat.c:1705 #6 0x00000000004dd0fa in run_builtin (p=0xa21e00 <commands+288>, argc=3, argv=0x7fffffffd670) at perf.c:304 #7 0x00000000004dd367 in handle_internal_command (argc=3, argv=0x7fffffffd670) at perf.c:356 #8 0x00000000004dd4ae in run_argv (argcp=0x7fffffffd4cc, argv=0x7fffffffd4c0) at perf.c:400 #9 0x00000000004dd81a in main (argc=3, argv=0x7fffffffd670) at perf.c:522
(gdb) bt
I'm applying it to fix this issue and avoid a bisection break. I'm now going to run 'perf test' after each cset too. And probably the next cset has this issue as well, i.e. reordering of initialization in the perf_evsel__init() case.
tools/perf/util/evlist.c +1 -1
@@ -49,11 +49,11 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,for (i =0 ; i <PERF_EVLIST__HLIST_SIZE ; ++i)INIT_HLIST_HEAD (&evlist->heads[i]); +perf_evlist__init (&evlist->core);perf_evlist__set_maps (evlist, cpus, threads);fdarray__init (&evlist->pollfd,64 ); evlist->workload.pid =-1 ; evlist->bkw_mmap_state =BKW_MMAP_NOTREADY ; -perf_evlist__init (&evlist->core); }struct evlist *evlist__new (void )
Re: [PATCH 38/79] libperf: Add perf_evlist__init function
On Mon, Jul 22, 2019 at 04:39:25PM -0300, Arnaldo Carvalho de Melo wrote:
SNIP
Quoted 11 lines
I'm applying it to fix this issue and avoid a bisection break. I'm now going to run 'perf test' after each cset too. And probably the next cset has this issue as well, i.e. reordering of initialization in the
perf_evsel__init()case.tools/perf/util/evlist.c +0
-0
tools/perf/util/evlist.c void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, · line 52
Quoted 4 lines
tools/perf/util/evlist.c +1
-0@@ -49,11 +49,11 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,for (i =0 ; i <PERF_EVLIST__HLIST_SIZE ; ++i)INIT_HLIST_HEAD (&evlist->heads[i]); +perf_evlist__init (&evlist->core);
right, needs to be before perf_evlist__set_maps call
thanks,
jirka
Quoted 8 lines
tools/perf/util/evlist.c +0
-1perf_evlist__set_maps (evlist, cpus, threads);fdarray__init (&evlist->pollfd,64 ); evlist->workload.pid =-1 ; evlist->bkw_mmap_state =BKW_MMAP_NOTREADY ; -perf_evlist__init (&evlist->core); }struct evlist *evlist__new (void )
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Add perf_evlist__init() function
In reply to Jiri Olsalibperf: Add perf_evlist__init() function
Commit-ID: 4562a7393996bb28bf629277903a561bfefea177 Gitweb: https://git.kernel.org/tip/4562a7393996bb28bf629277903a561bfefea177 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:25 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Add perf_evlist__init() function
Add the perf_evlist__init() function to initialize a perf_evlist struct.
Committer testing:
Fix a change in init ordering that was causing this backtrace:
(gdb) run stat sleep 1
Starting program: /root/bin/perf stat sleep 1
Program received signal SIGSEGV, Segmentation fault.
0x00000000004f6b55 in __perf_evlist__propagate_maps (evlist=0xbb34c0, evsel=0x0) at util/evlist.c:161
161 if (!evsel->own_cpus || evlist->has_user_cpus) {
Missing separate debuginfos, use: dnf debuginfo-install bzip2-libs-1.0.6-29.fc30.x86_64 elfutils-libelf-0.176-3.fc30.x86_64 elfutils-libs-0.176-3.fc30.x86_64 glib2-2.60.4-1.fc30.x86_64 libbabeltrace-1.5.6-2.fc30.x86_64 libgcc-9.1.1-1.fc30.x86_64 libunwind-1.3.1-2.fc30.x86_64 libuuid-2.33.2-1.fc30.x86_64 libxcrypt-4.4.6-2.fc30.x86_64 libzstd-1.4.0-1.fc30.x86_64 numactl-libs-2.0.12-2.fc30.x86_64 pcre-8.43-2.fc30.x86_64 perl-libs-5.28.2-436.fc30.x86_64 popt-1.16-17.fc30.x86_64 python2-libs-2.7.16-2.fc30.x86_64 slang-2.3.2-5.fc30.x86_64 xz-libs-5.2.4-5.fc30.x86_64 zlib-1.2.11-15.fc30.x86_64 (gdb) bt
#0 0x00000000004f6b55 in __perf_evlist__propagate_maps (evlist=0xbb34c0, evsel=0x0) at util/evlist.c:161 #1 0x00000000004f6c7a in perf_evlist__propagate_maps (evlist=0xbb34c0) at util/evlist.c:178 #2 0x00000000004f955e in perf_evlist__set_maps (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:1128 #3 0x00000000004f66f8 in evlist__init (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:52 #4 0x00000000004f6790 in evlist__new () at util/evlist.c:64 #5 0x0000000000456071 in cmd_stat (argc=3, argv=0x7fffffffd670) at builtin-stat.c:1705 #6 0x00000000004dd0fa in run_builtin (p=0xa21e00 <commands+288>, argc=3, argv=0x7fffffffd670) at perf.c:304 #7 0x00000000004dd367 in handle_internal_command (argc=3, argv=0x7fffffffd670) at perf.c:356 #8 0x00000000004dd4ae in run_argv (argcp=0x7fffffffd4cc, argv=0x7fffffffd4c0) at perf.c:400 #9 0x00000000004dd81a in main (argc=3, argv=0x7fffffffd670) at perf.c:522
(gdb) bt
So move the initialization of the core evlist (calling perf_evlist__init()) to before perf_evlist__set_maps() in evlist__init().
--- tools/perf/lib/evlist.c | 5 +++++ tools/perf/lib/include/perf/evlist.h | 4 ++++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-)
tools/perf/lib/evlist.c +5 -0
@@ -2,3 +2,8 @@#include <perf/evlist.h> #include <linux/list.h> #include <internal/evlist.h> + +void perf_evlist__init (struct perf_evlist *evlist) +{ +INIT_LIST_HEAD (&evlist->entries); +}
tools/perf/lib/include/perf/evlist.h +4 -0
@@ -2,6 +2,10 @@#ifndef __LIBPERF_EVLIST_H#define __LIBPERF_EVLIST_H +#include <perf/core.h> +struct perf_evlist ; +LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); +#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/libperf.map +1 -0
@@ -10,6 +10,7 @@ LIBPERF_0.0.1 { perf_thread_map__get; perf_thread_map__put; perf_evsel__init; + perf_evlist__init; local: *; };
tools/perf/util/evlist.c +2 -1
@@ -33,6 +33,7 @@#include <linux/log2.h> #include <linux/err.h> #include <linux/zalloc.h> +#include <perf/evlist.h> #ifdef LACKS_SIGQUEUE_PROTOTYPE int sigqueue (pid_t pid,int sig,const union sigval value);
@@ -48,7 +49,7 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,for (i =0 ; i <PERF_EVLIST__HLIST_SIZE ; ++i)INIT_HLIST_HEAD (&evlist->heads[i]); -INIT_LIST_HEAD (&evlist->core.entries); +perf_evlist__init (&evlist->core);perf_evlist__set_maps (evlist, cpus, threads);fdarray__init (&evlist->pollfd,64 ); evlist->workload.pid =-1 ;
Jiri Olsa
reviewerPATCH 39/79 libperf: Add perf_evlist__add function
In reply to Jiri OlsaAdding perf_evlist__add function to add perf_evsel in perf_evlist struct.
--- tools/perf/lib/evlist.c | 7 +++++++ tools/perf/lib/include/perf/evlist.h | 3 +++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-)
tools/perf/lib/evlist.c +7 -0
@@ -2,8 +2,15 @@#include <perf/evlist.h> #include <linux/list.h> #include <internal/evlist.h> +#include <internal/evsel.h> void perf_evlist__init (struct perf_evlist *evlist) {INIT_LIST_HEAD (&evlist->entries); } + +void perf_evlist__add (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +list_add_tail (&evsel->node, &evlist->entries); +}
tools/perf/lib/include/perf/evlist.h +3 -0
@@ -5,7 +5,10 @@#include <perf/core.h> struct perf_evlist ; +struct perf_evsel ; LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); +LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist, +struct perf_evsel *evsel);#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/libperf.map +1 -0
@@ -11,6 +11,7 @@ LIBPERF_0.0.1 { perf_thread_map__put; perf_evsel__init; perf_evlist__init; + perf_evlist__add; local: *; };
tools/perf/util/evlist.c +1 -1
@@ -180,8 +180,8 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { +perf_evlist__add (&evlist->core, &entry->core); entry->evlist = evlist; -list_add_tail (&entry->core.node, &evlist->core.entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
Signature · 1 line
2.21.0
Re: [PATCH 39/79] libperf: Add perf_evlist__add function
Em Sun, Jul 21, 2019 at 01:24:26PM +0200, Jiri Olsa escreveu:
Quoted 64 lines
Adding
perf_evlist__addfunction to addperf_evselinperf_evliststruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/lib/evlist.c | 7 +++++++ tools/perf/lib/include/perf/evlist.h | 3 +++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-)tools/perf/lib/evlist.c +7
-0@@ -2,8 +2,15 @@#include <perf/evlist.h> #include <linux/list.h> #include <internal/evlist.h> +#include <internal/evsel.h> void perf_evlist__init (struct perf_evlist *evlist) {INIT_LIST_HEAD (&evlist->entries); } + +void perf_evlist__add (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +list_add_tail (&evsel->node, &evlist->entries); +}tools/perf/lib/include/perf/evlist.h +3
-0@@ -5,7 +5,10 @@#include <perf/core.h> struct perf_evlist ; +struct perf_evsel ; LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); +LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist, +struct perf_evsel *evsel);#endif /* __LIBPERF_EVLIST_H */ tools/perf/lib/libperf.map +1
-0@@ -11,6 +11,7 @@ LIBPERF_0.0.1 { perf_thread_map__put; perf_evsel__init; perf_evlist__init; + perf_evlist__add; local: *; };tools/perf/util/evlist.c +0
-0
tools/perf/util/evlist.c static void perf_evlist__propagate_maps(struct evlist *evlist) · line 186
Quoted 8 lines
tools/perf/util/evlist.c +1
-1@@ -180,8 +180,8 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { +perf_evlist__add (&evlist->core, &entry->core); entry->evlist = evlist; -list_add_tail (&entry->core.node, &evlist->core.entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
Right after applying this patch my alias for building perf crashes:
I.e. I have:
alias m='perf stat -e cycles:u,instructions:u make -k O=/tmp/build/perf -C tools/perf install-bin'
And I'm applyin your series patch by patch, it stopped working when I tried to build the next patch in this series, as the previous one caused the segfault below, investigating...
(gdb) run stat sleep 1
Starting program: /root/bin/perf stat sleep 1
Missing separate debuginfos, use: dnf debuginfo-install glibc-2.29-15.fc30.x86_64 [Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1".
Program received signal SIGSEGV, Segmentation fault.0x00000000004f6b55 in __perf_evlist__propagate_maps (evlist=0xbb34c0, evsel=0x0) at util/evlist.c:161
161 if (!evsel->own_cpus || evlist->has_user_cpus) {
Missing separate debuginfos, use: dnf debuginfo-install bzip2-libs-1.0.6-29.fc30.x86_64 elfutils-libelf-0.176-3.fc30.x86_64 elfutils-libs-0.176-3.fc30.x86_64 glib2-2.60.4-1.fc30.x86_64 libbabeltrace-1.5.6-2.fc30.x86_64 libgcc-9.1.1-1.fc30.x86_64 libunwind-1.3.1-2.fc30.x86_64 libuuid-2.33.2-1.fc30.x86_64 libxcrypt-4.4.6-2.fc30.x86_64 libzstd-1.4.0-1.fc30.x86_64 numactl-libs-2.0.12-2.fc30.x86_64 pcre-8.43-2.fc30.x86_64 perl-libs-5.28.2-436.fc30.x86_64 popt-1.16-17.fc30.x86_64 python2-libs-2.7.16-2.fc30.x86_64 slang-2.3.2-5.fc30.x86_64 xz-libs-5.2.4-5.fc30.x86_64 zlib-1.2.11-15.fc30.x86_64 (gdb) p evsel
$1 = (struct evsel *) 0x0
(gdb) p evlist
$2 = (struct evlist *) 0xbb34c0
(gdb) bt
#0 0x00000000004f6b55 in __perf_evlist__propagate_maps (evlist=0xbb34c0, evsel=0x0) at util/evlist.c:161 #1 0x00000000004f6c7a in perf_evlist__propagate_maps (evlist=0xbb34c0) at util/evlist.c:178 #2 0x00000000004f955e in perf_evlist__set_maps (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:1128 #3 0x00000000004f66f8 in evlist__init (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:52 #4 0x00000000004f6790 in evlist__new () at util/evlist.c:64 #5 0x0000000000456071 in cmd_stat (argc=3, argv=0x7fffffffd670) at builtin-stat.c:1705 #6 0x00000000004dd0fa in run_builtin (p=0xa21e00 <commands+288>, argc=3, argv=0x7fffffffd670) at perf.c:304 #7 0x00000000004dd367 in handle_internal_command (argc=3, argv=0x7fffffffd670) at perf.c:356 #8 0x00000000004dd4ae in run_argv (argcp=0x7fffffffd4cc, argv=0x7fffffffd4c0) at perf.c:400 #9 0x00000000004dd81a in main (argc=3, argv=0x7fffffffd670) at perf.c:522
(gdb)
Re: [PATCH 39/79] libperf: Add perf_evlist__add function
On Mon, Jul 22, 2019 at 04:09:35PM -0300, Arnaldo Carvalho de Melo wrote:
SNIP
Quoted 36 lines
Right after applying this patch my alias for building perf crashes:
I.e. I have:
alias m='perf stat -e cycles:u,instructions:u make -k O=/tmp/build/perf -C
tools/perfinstall-bin'And I'm applyin your series patch by patch, it stopped working when I tried to build the next patch in this series, as the previous one caused the segfault below, investigating...
(gdb) run stat sleep 1
Starting program:/root/bin/perfstat sleep 1
Missing separate debuginfos, use: dnf debuginfo-install glibc-2.29-15.fc30.x86_64 [Thread debugging usinglibthread_dbenabled]
Using hostlibthread_dblibrary "/lib64/libthread_db.so.1".Program received signal SIGSEGV, Segmentation fault.
0x00000000004f6b55in__perf_evlist__propagate_maps(evlist=0xbb34c0, evsel=0x0) atutil/evlist.c:161
161 if (!evsel->own_cpus ||evlist->has_user_cpus) {
Missing separate debuginfos, use: dnf debuginfo-install bzip2-libs-1.0.6-29.fc30.x86_64 elfutils-libelf-0.176-3.fc30.x86_64 elfutils-libs-0.176-3.fc30.x86_64 glib2-2.60.4-1.fc30.x86_64 libbabeltrace-1.5.6-2.fc30.x86_64 libgcc-9.1.1-1.fc30.x86_64 libunwind-1.3.1-2.fc30.x86_64 libuuid-2.33.2-1.fc30.x86_64 libxcrypt-4.4.6-2.fc30.x86_64 libzstd-1.4.0-1.fc30.x86_64 numactl-libs-2.0.12-2.fc30.x86_64 pcre-8.43-2.fc30.x86_64 perl-libs-5.28.2-436.fc30.x86_64 popt-1.16-17.fc30.x86_64 python2-libs-2.7.16-2.fc30.x86_64 slang-2.3.2-5.fc30.x86_64 xz-libs-5.2.4-5.fc30.x86_64 zlib-1.2.11-15.fc30.x86_64 (gdb) p evsel
$1 = (struct evsel *)0x0
(gdb) p evlist
$2 = (struct evlist *)0xbb34c0
(gdb) bt#0 0x00000000004f6b55 in __perf_evlist__propagate_maps (evlist=0xbb34c0, evsel=0x0) at util/evlist.c:161 #1 0x00000000004f6c7a in perf_evlist__propagate_maps (evlist=0xbb34c0) at util/evlist.c:178 #2 0x00000000004f955e in perf_evlist__set_maps (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:1128 #3 0x00000000004f66f8 in evlist__init (evlist=0xbb34c0, cpus=0x0, threads=0x0) at util/evlist.c:52 #4 0x00000000004f6790 in evlist__new () at util/evlist.c:64 #5 0x0000000000456071 in cmd_stat (argc=3, argv=0x7fffffffd670) at builtin-stat.c:1705 #6 0x00000000004dd0fa in run_builtin (p=0xa21e00 <commands+288>, argc=3, argv=0x7fffffffd670) at perf.c:304 #7 0x00000000004dd367 in handle_internal_command (argc=3, argv=0x7fffffffd670) at perf.c:356 #8 0x00000000004dd4ae in run_argv (argcp=0x7fffffffd4cc, argv=0x7fffffffd4c0) at perf.c:400 #9 0x00000000004dd81a in main (argc=3, argv=0x7fffffffd670) at perf.c:522
Quoted 1 line
(gdb)
hum, with the previous fix of yours applied I dont see this crash
jirka
Re: [PATCH 39/79] libperf: Add perf_evlist__add function
In reply to Jiri OlsaEm Sun, Jul 21, 2019 at 01:24:26PM +0200, Jiri Olsa escreveu:
Quoted 64 lines
Adding
perf_evlist__addfunction to addperf_evselinperf_evliststruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/lib/evlist.c | 7 +++++++ tools/perf/lib/include/perf/evlist.h | 3 +++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-)tools/perf/lib/evlist.c +7
-0@@ -2,8 +2,15 @@#include <perf/evlist.h> #include <linux/list.h> #include <internal/evlist.h> +#include <internal/evsel.h> void perf_evlist__init (struct perf_evlist *evlist) {INIT_LIST_HEAD (&evlist->entries); } + +void perf_evlist__add (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +list_add_tail (&evsel->node, &evlist->entries); +}tools/perf/lib/include/perf/evlist.h +3
-0@@ -5,7 +5,10 @@#include <perf/core.h> struct perf_evlist ; +struct perf_evsel ; LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); +LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist, +struct perf_evsel *evsel);#endif /* __LIBPERF_EVLIST_H */ tools/perf/lib/libperf.map +1
-0@@ -11,6 +11,7 @@ LIBPERF_0.0.1 { perf_thread_map__put; perf_evsel__init; perf_evlist__init; + perf_evlist__add; local: *; };tools/perf/util/evlist.c +0
-0
tools/perf/util/evlist.c static void perf_evlist__propagate_maps(struct evlist *evlist) · line 186
Quoted 8 lines
tools/perf/util/evlist.c +1
-1@@ -180,8 +180,8 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { +perf_evlist__add (&evlist->core, &entry->core); entry->evlist = evlist; -list_add_tail (&entry->core.node, &evlist->core.entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
this inversion was ok, it by definition doesn't use entry->evlist, just core stuff.
- Arnaldo
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Add perf_evlist__add() function
In reply to Jiri Olsalibperf: Add perf_evlist__add() function
Commit-ID: 9a5edde6d3a6fb26101406534f7a5d09a9fcd362 Gitweb: https://git.kernel.org/tip/9a5edde6d3a6fb26101406534f7a5d09a9fcd362 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:26 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Add perf_evlist__add() function
Add the perf_evlist__add() function to add a perf_evsel in a perf_evlist struct.
--- tools/perf/lib/evlist.c | 7 +++++++ tools/perf/lib/include/perf/evlist.h | 3 +++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-)
tools/perf/lib/evlist.c +7 -0
@@ -2,8 +2,15 @@#include <perf/evlist.h> #include <linux/list.h> #include <internal/evlist.h> +#include <internal/evsel.h> void perf_evlist__init (struct perf_evlist *evlist) {INIT_LIST_HEAD (&evlist->entries); } + +void perf_evlist__add (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +list_add_tail (&evsel->node, &evlist->entries); +}
tools/perf/lib/include/perf/evlist.h +3 -0
@@ -5,7 +5,10 @@#include <perf/core.h> struct perf_evlist ; +struct perf_evsel ; LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); +LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist, +struct perf_evsel *evsel);#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/libperf.map +1 -0
@@ -11,6 +11,7 @@ LIBPERF_0.0.1 { perf_thread_map__put; perf_evsel__init; perf_evlist__init; + perf_evlist__add; local: *; };
tools/perf/util/evlist.c +1 -1
@@ -180,8 +180,8 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { +perf_evlist__add (&evlist->core, &entry->core); entry->evlist = evlist; -list_add_tail (&entry->core.node, &evlist->core.entries); entry->idx = evlist->nr_entries; entry->tracking = !entry->idx;
Jiri Olsa
reviewerPATCH 40/79 libperf: Add perf_evlist__remove function
In reply to Jiri OlsaAdding perf_evlist__remove function to remove perf_evsel from perf_evlist struct.
--- tools/perf/lib/evlist.c | 6 ++++++ tools/perf/lib/include/perf/evlist.h | 2 ++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-)
tools/perf/lib/evlist.c +6 -0
@@ -14,3 +14,9 @@ void perf_evlist__add(struct perf_evlist *evlist, {list_add_tail (&evsel->node, &evlist->entries); } + +void perf_evlist__remove (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +list_del_init (&evsel->node); +}
tools/perf/lib/include/perf/evlist.h +2 -0
@@ -10,5 +10,7 @@ struct perf_evsel; LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist,struct perf_evsel *evsel); +LIBPERF_API void perf_evlist__remove(struct perf_evlist *evlist, +struct perf_evsel *evsel);#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/libperf.map +1 -0
@@ -12,6 +12,7 @@ LIBPERF_0.0.1 { perf_evsel__init; perf_evlist__init; perf_evlist__add; + perf_evlist__remove; local: *; };
tools/perf/util/evlist.c +1 -1
@@ -194,7 +194,7 @@ void evlist__add(struct evlist *evlist, struct evsel *entry)void evlist__remove (struct evlist *evlist,struct evsel *evsel) { evsel->evlist =NULL ; -list_del_init (&evsel->core.node); +perf_evlist__remove (&evlist->core, &evsel->core); evlist->nr_entries -=1 ; }
Signature · 1 line
2.21.0
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Add perf_evlist__remove() function
libperf: Add perf_evlist__remove() function
Commit-ID: 52e22fb8af779e1a26b1cbde1db2f82f78b3ae68 Gitweb: https://git.kernel.org/tip/52e22fb8af779e1a26b1cbde1db2f82f78b3ae68 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:27 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:44 -0300
libperf: Add perf_evlist__remove() function
Adding perf_evlist__remove() function to remove a perf_evsel from a perf_evlist struct.
--- tools/perf/lib/evlist.c | 6 ++++++ tools/perf/lib/include/perf/evlist.h | 2 ++ tools/perf/lib/libperf.map | 1 + tools/perf/util/evlist.c | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-)
tools/perf/lib/evlist.c +6 -0
@@ -14,3 +14,9 @@ void perf_evlist__add(struct perf_evlist *evlist, {list_add_tail (&evsel->node, &evlist->entries); } + +void perf_evlist__remove (struct perf_evlist *evlist, +struct perf_evsel *evsel) +{ +list_del_init (&evsel->node); +}
tools/perf/lib/include/perf/evlist.h +2 -0
@@ -10,5 +10,7 @@ struct perf_evsel; LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist); LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist,struct perf_evsel *evsel); +LIBPERF_API void perf_evlist__remove(struct perf_evlist *evlist, +struct perf_evsel *evsel);#endif /* __LIBPERF_EVLIST_H */
tools/perf/lib/libperf.map +1 -0
@@ -12,6 +12,7 @@ LIBPERF_0.0.1 { perf_evsel__init; perf_evlist__init; perf_evlist__add; + perf_evlist__remove; local: *; };
tools/perf/util/evlist.c +1 -1
@@ -194,7 +194,7 @@ void evlist__add(struct evlist *evlist, struct evsel *entry)void evlist__remove (struct evlist *evlist,struct evsel *evsel) { evsel->evlist =NULL ; -list_del_init (&evsel->core.node); +perf_evlist__remove (&evlist->core, &evsel->core); evlist->nr_entries -=1 ; }
Jiri Olsa
reviewerPATCH 41/79 libperf: Add nr_entries to perf_evlist
In reply to Jiri OlsaMoving nr_entries count into perf_evlist struct.
--- tools/perf/builtin-record.c | 4 +- tools/perf/builtin-stat.c | 4 +- tools/perf/builtin-top.c | 12 ++-- tools/perf/builtin-trace.c | 4 +- tools/perf/lib/evlist.c | 3 + tools/perf/lib/include/internal/evlist.h | 1 + tools/perf/tests/parse-events.c | 76 ++++++++++++------------ tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/ui/browsers/hists.c | 2 +- tools/perf/util/annotate.c | 2 +- tools/perf/util/evlist.c | 26 ++++---- tools/perf/util/evlist.h | 1 - tools/perf/util/header.c | 4 +- tools/perf/util/parse-events.c | 4 +- tools/perf/util/python.c | 8 +-- tools/perf/util/record.c | 2 +- tools/perf/util/sort.c | 2 +- tools/perf/util/top.c | 2 +- 18 files changed, 81 insertions(+), 78 deletions(-)
tools/perf/builtin-record.c +2 -2
@@ -1375,7 +1375,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)* because we synthesize event name through the pipe * and need the id for that. */ -if (data->is_pipe && rec->evlist->nr_entries ==1 ) +if (data->is_pipe && rec->evlist->core.nr_entries ==1 ) rec->opts.sample_id = true;if (record__open (rec) !=0 ) {
@@ -2386,7 +2386,7 @@ int cmd_record(int argc, const char **argv)if (record.opts.overwrite) record.opts.tail_synthesize = true; -if (rec->evlist->nr_entries ==0 && +if (rec->evlist->core.nr_entries ==0 &&__perf_evlist__add_default (rec->evlist, !record.opts.no_samples) <0 ) {pr_err ("Not enough memory for event selector list\n" ); goto out;
tools/perf/builtin-stat.c +2 -2
@@ -1366,7 +1366,7 @@ static int add_default_attributes(void)free (str); } -if (!evsel_list->nr_entries) { +if (!evsel_list->core.nr_entries) {if (target__has_cpu (&target)) default_attrs0[0 ].config =PERF_COUNT_SW_CPU_CLOCK ;
@@ -1683,7 +1683,7 @@ static void setup_system_wide(int forks)return ; } -if (evsel_list->nr_entries) +if (evsel_list->core.nr_entries) target.system_wide = true; } }
tools/perf/builtin-top.c +6 -6
@@ -129,7 +129,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) notes =symbol__annotation (sym);pthread_mutex_lock (¬es->lock); -if (!symbol__hists (sym, top->evlist->nr_entries)) { +if (!symbol__hists (sym, top->evlist->core.nr_entries)) {pthread_mutex_unlock (¬es->lock);pr_err ("Not enough memory for annotating '%s' symbol!\n" , sym->name);
@@ -404,7 +404,7 @@ static void perf_top__print_mapped_keys(struct perf_top *top)fprintf (stdout,"\t[d] display refresh delay. \t(%d)\n" , top->delay_secs);fprintf (stdout,"\t[e] display entries (lines). \t(%d)\n" , top->print_entries); -if (top->evlist->nr_entries >1 ) +if (top->evlist->core.nr_entries >1 )fprintf (stdout,"\t[E] active event counter. \t(%s)\n" ,perf_evsel__name (top->sym_evsel));fprintf (stdout,"\t[f] profile display filter (count). \t(%d)\n" , top->count_filter);
@@ -439,7 +439,7 @@ static int perf_top__key_mapped(struct perf_top *top, int c)case 'S' :return 1 ;case 'E' : -return top->evlist->nr_entries >1 ?1 :0 ; +return top->evlist->core.nr_entries >1 ?1 :0 ;default :break ; }
@@ -485,7 +485,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c) }break ;case 'E' : -if (top->evlist->nr_entries >1 ) { +if (top->evlist->core.nr_entries >1 ) {/* Select 0 as the default event: */ int counter =0 ;
@@ -496,7 +496,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)prompt_integer (&counter,"Enter details event counter" ); -if (counter >= top->evlist->nr_entries) { +if (counter >= top->evlist->core.nr_entries) { top->sym_evsel =perf_evlist__first (top->evlist);fprintf (stderr,"Sorry, no such event, using %s.\n" ,perf_evsel__name (top->sym_evsel));sleep (1 );
@@ -1536,7 +1536,7 @@ int cmd_top(int argc, const char **argv)if (argc)usage_with_options (top_usage, options); -if (!top.evlist->nr_entries && +if (!top.evlist->core.nr_entries &&perf_evlist__add_default (top.evlist) <0 ) {pr_err ("Not enough memory for event selector list\n" ); goto out_delete_evlist;
tools/perf/builtin-trace.c +2 -2
@@ -4272,7 +4272,7 @@ int cmd_trace(int argc, const char **argv) symbol_conf.use_callchain = true; } -if (trace.evlist->nr_entries >0 ) { +if (trace.evlist->core.nr_entries >0 ) {evlist__set_evsel_handler (trace.evlist, trace__event_handler);if (evlist__set_syscall_tp_fields (trace.evlist)) {perror ("failed to set syscalls:* tracepoint fields" );
@@ -4370,7 +4370,7 @@ int cmd_trace(int argc, const char **argv) trace.summary = trace.summary_only;if (!trace.trace_syscalls && !trace.trace_pgfaults && - trace.evlist->nr_entries ==0 /* Was --events used? */ ) { + trace.evlist->core.nr_entries ==0 /* Was --events used? */ ) { trace.trace_syscalls = true; }
tools/perf/lib/evlist.c +3 -0
@@ -7,16 +7,19 @@void perf_evlist__init (struct perf_evlist *evlist) {INIT_LIST_HEAD (&evlist->entries); + evlist->nr_entries =0 ; }void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *evsel) {list_add_tail (&evsel->node, &evlist->entries); + evlist->nr_entries +=1 ; }void perf_evlist__remove (struct perf_evlist *evlist,struct perf_evsel *evsel) {list_del_init (&evsel->node); + evlist->nr_entries -=1 ; }
tools/perf/lib/include/internal/evlist.h +1 -0
@@ -4,6 +4,7 @@struct perf_evlist {struct list_head entries; +int nr_entries; };#endif /* __LIBPERF_INTERNAL_EVLIST_H */
tools/perf/tests/parse-events.c +38 -38
304 lines not on this page · raw message
tools/perf/ui/browsers/annotate.c +1 -1
@@ -422,7 +422,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, notes =symbol__annotation (dl->ops.target.sym);pthread_mutex_lock (¬es->lock); -if (!symbol__hists (dl->ops.target.sym, evsel->evlist->nr_entries)) { +if (!symbol__hists (dl->ops.target.sym, evsel->evlist->core.nr_entries)) {pthread_mutex_unlock (¬es->lock);ui__warning ("Not enough memory for annotating '%s' symbol!\n" , dl->ops.target.sym->name);
tools/perf/ui/browsers/hists.c +1 -1
@@ -3404,7 +3404,7 @@ int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help,bool warn_lost_event, struct annotation_options *annotation_opts) { - int nr_entries = evlist->nr_entries; + int nr_entries = evlist->core.nr_entries; single_entry:if (nr_entries ==1 ) {
tools/perf/util/annotate.c +1 -1
@@ -936,7 +936,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map,if (sym ==NULL )return 0 ; - src =symbol__hists (sym, evsel->evlist->nr_entries); + src =symbol__hists (sym, evsel->evlist->core.nr_entries);return (src) ?__symbol__inc_addr_samples (sym, map, src, evsel->idx, addr, sample) :0 ; }
tools/perf/util/evlist.c +13 -13
@@ -125,7 +125,7 @@ static void perf_evlist__purge(struct evlist *evlist)evsel__delete (pos); } - evlist->nr_entries =0 ; + evlist->core.nr_entries =0 ; }void perf_evlist__exit (struct evlist *evlist)
@@ -180,12 +180,13 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { -perf_evlist__add (&evlist->core, &entry->core); entry->evlist = evlist; - entry->idx = evlist->nr_entries; + entry->idx = evlist->core.nr_entries; entry->tracking = !entry->idx; -if (!evlist->nr_entries++) +perf_evlist__add (&evlist->core, &entry->core); + +if (evlist->core.nr_entries ==1 )perf_evlist__set_id_pos (evlist);__perf_evlist__propagate_maps (evlist, entry);
@@ -195,7 +196,6 @@ void evlist__remove(struct evlist *evlist, struct evsel *evsel) { evsel->evlist =NULL ;perf_evlist__remove (&evlist->core, &evsel->core); - evlist->nr_entries -=1 ; } void perf_evlist__splice_list_tail(struct evlist *evlist,
@@ -225,8 +225,8 @@ void __perf_evlist__set_leader(struct list_head *list)void perf_evlist__set_leader (struct evlist *evlist) { -if (evlist->nr_entries) { - evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ; +if (evlist->core.nr_entries) { + evlist->nr_groups = evlist->core.nr_entries >1 ?1 :0 ;__perf_evlist__set_leader (&evlist->core.entries); } }
@@ -249,7 +249,7 @@ int perf_evlist__add_dummy(struct evlist *evlist) .config = PERF_COUNT_SW_DUMMY, .size = sizeof(attr), /* to capture ABI version */ }; -struct evsel *evsel =perf_evsel__new_idx (&attr, evlist->nr_entries); +struct evsel *evsel =perf_evsel__new_idx (&attr, evlist->core.nr_entries);if (evsel ==NULL )return -ENOMEM ;
@@ -266,7 +266,7 @@ static int evlist__add_attrs(struct evlist *evlist,size_t i;for (i =0 ; i < nr_attrs; i++) { - evsel =perf_evsel__new_idx (attrs + i, evlist->nr_entries + i); + evsel =perf_evsel__new_idx (attrs + i, evlist->core.nr_entries + i);if (evsel ==NULL ) goto out_delete_partial_list;list_add_tail (&evsel->core.node, &head);
@@ -581,7 +581,7 @@ struct evsel *perf_evlist__id2evsel(struct evlist *evlist, u64 id) {struct perf_sample_id *sid; -if (evlist->nr_entries ==1 || !id) +if (evlist->core.nr_entries ==1 || !id)return perf_evlist__first (evlist); sid =perf_evlist__id2sid (evlist, id);
@@ -639,7 +639,7 @@ struct evsel *perf_evlist__event2evsel(struct evlist *evlist,int hash;u64 id; -if (evlist->nr_entries ==1 ) +if (evlist->core.nr_entries ==1 )return first; if (!first->attr.sample_id_all &&
@@ -1222,7 +1222,7 @@ bool perf_evlist__valid_sample_type(struct evlist *evlist) {struct evsel *pos; -if (evlist->nr_entries ==1 ) +if (evlist->core.nr_entries ==1 )return true;if (evlist->id_pos <0 || evlist->is_pos <0 )
@@ -1849,7 +1849,7 @@ int perf_evlist__add_sb_event(struct evlist **evlist, attr->sample_id_all =1 ; } - evsel =perf_evsel__new_idx (attr, (*evlist)->nr_entries); + evsel =perf_evsel__new_idx (attr, (*evlist)->core.nr_entries);if (!evsel) goto out_err;
tools/perf/util/evlist.h +0 -1
@@ -28,7 +28,6 @@ struct record_opts;struct evlist {struct perf_evlist core;struct hlist_head heads[PERF_EVLIST__HLIST_SIZE ]; -int nr_entries;int nr_groups;int nr_mmaps;bool enabled;
tools/perf/util/header.c +2 -2
@@ -476,7 +476,7 @@ static int write_event_desc(struct feat_fd *ff,u32 nre, nri, sz;int ret; - nre = evlist->nr_entries; + nre = evlist->core.nr_entries;/* * write number of events
@@ -3100,7 +3100,7 @@ int perf_session__write_header(struct perf_session *session, .attr_size = sizeof(f_attr), .attrs = { .offset = attr_offset, - .size = evlist->nr_entries * sizeof(f_attr), + .size = evlist->core.nr_entries * sizeof(f_attr), }, .data = { .offset = header->data_offset,
tools/perf/util/parse-events.c +2 -2
@@ -1909,7 +1909,7 @@ int parse_events(struct evlist *evlist, const char *str, {struct parse_events_state parse_state = { .list =LIST_HEAD_INIT (parse_state.list), - .idx = evlist->nr_entries, + .idx = evlist->core.nr_entries, .error = err, .evlist = evlist, };
@@ -2040,7 +2040,7 @@ foreach_evsel_in_last_glob(struct evlist *evlist,* * So no need to WARN here, let *func do this. */ -if (evlist->nr_entries >0 ) +if (evlist->core.nr_entries >0 ) last =perf_evlist__last (evlist); do {
tools/perf/util/python.c +4 -4
@@ -973,10 +973,10 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist,Py_INCREF (pevsel); evsel = &((struct pyrf_evsel *)pevsel)->evsel; - evsel->idx = evlist->nr_entries; + evsel->idx = evlist->core.nr_entries;evlist__add (evlist, evsel); -return Py_BuildValue ("i" , evlist->nr_entries); +return Py_BuildValue ("i" , evlist->core.nr_entries); }static struct perf_mmap *get_md (struct evlist *evlist,int cpu)
@@ -1112,7 +1112,7 @@ static Py_ssize_t pyrf_evlist__length(PyObject *obj) {struct pyrf_evlist *pevlist = (void *)obj; -return pevlist->evlist.nr_entries; +return pevlist->evlist.core.nr_entries; }static PyObject *pyrf_evlist__item (PyObject *obj,Py_ssize_t i)
@@ -1120,7 +1120,7 @@ static PyObject *pyrf_evlist__item(PyObject *obj, Py_ssize_t i)struct pyrf_evlist *pevlist = (void *)obj;struct evsel *pos; -if (i >= pevlist->evlist.nr_entries) +if (i >= pevlist->evlist.core.nr_entries)return NULL ;evlist__for_each_entry (&pevlist->evlist, pos) {
tools/perf/util/record.c +1 -1
@@ -166,7 +166,7 @@ void perf_evlist__config(struct evlist *evlist, struct record_opts *opts,*/ use_sample_identifier =perf_can_sample_identifier (); sample_id = true; - }else if (evlist->nr_entries >1 ) { + }else if (evlist->core.nr_entries >1 ) {struct evsel *first =perf_evlist__first (evlist);evlist__for_each_entry (evlist, evsel) {
tools/perf/util/sort.c +1 -1
@@ -2323,7 +2323,7 @@ static struct evsel *find_evsel(struct evlist *evlist, char *event_name)if (event_name[0 ] =='%' ) {int nr =strtol (event_name+1 ,NULL ,0 ); -if (nr > evlist->nr_entries) +if (nr > evlist->core.nr_entries)return NULL ; evsel =perf_evlist__first (evlist);
tools/perf/util/top.c +1 -1
@@ -70,7 +70,7 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size) esamples_percent); } -if (top->evlist->nr_entries ==1 ) { +if (top->evlist->core.nr_entries ==1 ) {struct evsel *first =perf_evlist__first (top->evlist); ret += SNPRINTF(bf + ret, size - ret, "%" PRIu64 "%s ", (uint64_t)first->attr.sample_period,
Signature · 1 line
2.21.0
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Add nr_entries to struct perf_evlist
libperf: Add nr_entries to struct perf_evlist
Commit-ID: 6484d2f9dc3ecbf13f07100f7f771d1d779eda04 Gitweb: https://git.kernel.org/tip/6484d2f9dc3ecbf13f07100f7f771d1d779eda04 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:28 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:45 -0300
libperf: Add nr_entries to struct perf_evlist
Move nr_entries count from 'struct perf' to into perf_evlist struct.
Committer notes:
Fix tools/perf/arch/s390/util/auxtrace.c case. And also the comment in tools/perf/util/annotate.h.
--- tools/perf/arch/s390/util/auxtrace.c | 2 +- tools/perf/builtin-record.c | 4 +- tools/perf/builtin-stat.c | 4 +- tools/perf/builtin-top.c | 12 ++--- tools/perf/builtin-trace.c | 4 +- tools/perf/lib/evlist.c | 3 ++ tools/perf/lib/include/internal/evlist.h | 1 + tools/perf/tests/parse-events.c | 76 ++++++++++++++++---------------- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/ui/browsers/hists.c | 2 +- tools/perf/util/annotate.c | 2 +- tools/perf/util/annotate.h | 2 +- tools/perf/util/evlist.c | 26 +++++------ tools/perf/util/evlist.h | 1 - tools/perf/util/header.c | 4 +- tools/perf/util/parse-events.c | 4 +- tools/perf/util/python.c | 8 ++-- tools/perf/util/record.c | 2 +- tools/perf/util/sort.c | 2 +- tools/perf/util/top.c | 2 +- 20 files changed, 83 insertions(+), 80 deletions(-)
tools/perf/arch/s390/util/auxtrace.c +1 -1
@@ -90,7 +90,7 @@ struct auxtrace_record *auxtrace_record__init(struct evlist *evlist,int diagnose =0 ; *err =0 ; -if (evlist->nr_entries ==0 ) +if (evlist->core.nr_entries ==0 )return NULL ;evlist__for_each_entry (evlist, pos) {
tools/perf/builtin-record.c +2 -2
@@ -1375,7 +1375,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)* because we synthesize event name through the pipe * and need the id for that. */ -if (data->is_pipe && rec->evlist->nr_entries ==1 ) +if (data->is_pipe && rec->evlist->core.nr_entries ==1 ) rec->opts.sample_id = true;if (record__open (rec) !=0 ) {
@@ -2386,7 +2386,7 @@ int cmd_record(int argc, const char **argv)if (record.opts.overwrite) record.opts.tail_synthesize = true; -if (rec->evlist->nr_entries ==0 && +if (rec->evlist->core.nr_entries ==0 &&__perf_evlist__add_default (rec->evlist, !record.opts.no_samples) <0 ) {pr_err ("Not enough memory for event selector list\n" ); goto out;
tools/perf/builtin-stat.c +2 -2
@@ -1366,7 +1366,7 @@ static int add_default_attributes(void)free (str); } -if (!evsel_list->nr_entries) { +if (!evsel_list->core.nr_entries) {if (target__has_cpu (&target)) default_attrs0[0 ].config =PERF_COUNT_SW_CPU_CLOCK ;
@@ -1683,7 +1683,7 @@ static void setup_system_wide(int forks)return ; } -if (evsel_list->nr_entries) +if (evsel_list->core.nr_entries) target.system_wide = true; } }
tools/perf/builtin-top.c +6 -6
@@ -129,7 +129,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) notes =symbol__annotation (sym);pthread_mutex_lock (¬es->lock); -if (!symbol__hists (sym, top->evlist->nr_entries)) { +if (!symbol__hists (sym, top->evlist->core.nr_entries)) {pthread_mutex_unlock (¬es->lock);pr_err ("Not enough memory for annotating '%s' symbol!\n" , sym->name);
@@ -404,7 +404,7 @@ static void perf_top__print_mapped_keys(struct perf_top *top)fprintf (stdout,"\t[d] display refresh delay. \t(%d)\n" , top->delay_secs);fprintf (stdout,"\t[e] display entries (lines). \t(%d)\n" , top->print_entries); -if (top->evlist->nr_entries >1 ) +if (top->evlist->core.nr_entries >1 )fprintf (stdout,"\t[E] active event counter. \t(%s)\n" ,perf_evsel__name (top->sym_evsel));fprintf (stdout,"\t[f] profile display filter (count). \t(%d)\n" , top->count_filter);
@@ -439,7 +439,7 @@ static int perf_top__key_mapped(struct perf_top *top, int c)case 'S' :return 1 ;case 'E' : -return top->evlist->nr_entries >1 ?1 :0 ; +return top->evlist->core.nr_entries >1 ?1 :0 ;default :break ; }
@@ -485,7 +485,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c) }break ;case 'E' : -if (top->evlist->nr_entries >1 ) { +if (top->evlist->core.nr_entries >1 ) {/* Select 0 as the default event: */ int counter =0 ;
@@ -496,7 +496,7 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)prompt_integer (&counter,"Enter details event counter" ); -if (counter >= top->evlist->nr_entries) { +if (counter >= top->evlist->core.nr_entries) { top->sym_evsel =perf_evlist__first (top->evlist);fprintf (stderr,"Sorry, no such event, using %s.\n" ,perf_evsel__name (top->sym_evsel));sleep (1 );
@@ -1536,7 +1536,7 @@ int cmd_top(int argc, const char **argv)if (argc)usage_with_options (top_usage, options); -if (!top.evlist->nr_entries && +if (!top.evlist->core.nr_entries &&perf_evlist__add_default (top.evlist) <0 ) {pr_err ("Not enough memory for event selector list\n" ); goto out_delete_evlist;
tools/perf/builtin-trace.c +2 -2
@@ -4270,7 +4270,7 @@ int cmd_trace(int argc, const char **argv) symbol_conf.use_callchain = true; } -if (trace.evlist->nr_entries >0 ) { +if (trace.evlist->core.nr_entries >0 ) {evlist__set_evsel_handler (trace.evlist, trace__event_handler);if (evlist__set_syscall_tp_fields (trace.evlist)) {perror ("failed to set syscalls:* tracepoint fields" );
@@ -4368,7 +4368,7 @@ init_augmented_syscall_tp: trace.summary = trace.summary_only;if (!trace.trace_syscalls && !trace.trace_pgfaults && - trace.evlist->nr_entries ==0 /* Was --events used? */ ) { + trace.evlist->core.nr_entries ==0 /* Was --events used? */ ) { trace.trace_syscalls = true; }
tools/perf/lib/evlist.c +3 -0
@@ -7,16 +7,19 @@void perf_evlist__init (struct perf_evlist *evlist) {INIT_LIST_HEAD (&evlist->entries); + evlist->nr_entries =0 ; }void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *evsel) {list_add_tail (&evsel->node, &evlist->entries); + evlist->nr_entries +=1 ; }void perf_evlist__remove (struct perf_evlist *evlist,struct perf_evsel *evsel) {list_del_init (&evsel->node); + evlist->nr_entries -=1 ; }
tools/perf/lib/include/internal/evlist.h +1 -0
@@ -4,6 +4,7 @@struct perf_evlist {struct list_head entries; +int nr_entries; };#endif /* __LIBPERF_INTERNAL_EVLIST_H */
tools/perf/tests/parse-events.c +38 -38
304 lines not on this page · raw message
tools/perf/ui/browsers/annotate.c +1 -1
@@ -422,7 +422,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, notes =symbol__annotation (dl->ops.target.sym);pthread_mutex_lock (¬es->lock); -if (!symbol__hists (dl->ops.target.sym, evsel->evlist->nr_entries)) { +if (!symbol__hists (dl->ops.target.sym, evsel->evlist->core.nr_entries)) {pthread_mutex_unlock (¬es->lock);ui__warning ("Not enough memory for annotating '%s' symbol!\n" , dl->ops.target.sym->name);
tools/perf/ui/browsers/hists.c +1 -1
@@ -3404,7 +3404,7 @@ int perf_evlist__tui_browse_hists(struct evlist *evlist, const char *help,bool warn_lost_event, struct annotation_options *annotation_opts) { - int nr_entries = evlist->nr_entries; + int nr_entries = evlist->core.nr_entries; single_entry:if (nr_entries ==1 ) {
tools/perf/util/annotate.c +1 -1
@@ -936,7 +936,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map,if (sym ==NULL )return 0 ; - src =symbol__hists (sym, evsel->evlist->nr_entries); + src =symbol__hists (sym, evsel->evlist->core.nr_entries);return (src) ?__symbol__inc_addr_samples (sym, map, src, evsel->idx, addr, sample) :0 ; }
tools/perf/util/annotate.h +1 -1
@@ -245,7 +245,7 @@ struct cyc_hist {/** struct annotated_source - symbols with hits have this attached as in sannotation * * @histograms: Array of addr hit histograms per event being monitored -* nr_histograms: This may not be the same as evsel->evlist->nr_entries if +* nr_histograms: This may not be the same as evsel->evlist->core.nr_entries if * we have more than a group in a evlist, where we will want * to see each group separately, that is why symbol__annotate2() * sets src->nr_histograms to evsel->nr_members.
tools/perf/util/evlist.c +13 -13
@@ -125,7 +125,7 @@ static void perf_evlist__purge(struct evlist *evlist)evsel__delete (pos); } - evlist->nr_entries =0 ; + evlist->core.nr_entries =0 ; }void perf_evlist__exit (struct evlist *evlist)
@@ -180,12 +180,13 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)void evlist__add (struct evlist *evlist,struct evsel *entry) { -perf_evlist__add (&evlist->core, &entry->core); entry->evlist = evlist; - entry->idx = evlist->nr_entries; + entry->idx = evlist->core.nr_entries; entry->tracking = !entry->idx; -if (!evlist->nr_entries++) +perf_evlist__add (&evlist->core, &entry->core); + +if (evlist->core.nr_entries ==1 )perf_evlist__set_id_pos (evlist);__perf_evlist__propagate_maps (evlist, entry);
@@ -195,7 +196,6 @@ void evlist__remove(struct evlist *evlist, struct evsel *evsel) { evsel->evlist =NULL ;perf_evlist__remove (&evlist->core, &evsel->core); - evlist->nr_entries -=1 ; } void perf_evlist__splice_list_tail(struct evlist *evlist,
@@ -225,8 +225,8 @@ void __perf_evlist__set_leader(struct list_head *list)void perf_evlist__set_leader (struct evlist *evlist) { -if (evlist->nr_entries) { - evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ; +if (evlist->core.nr_entries) { + evlist->nr_groups = evlist->core.nr_entries >1 ?1 :0 ;__perf_evlist__set_leader (&evlist->core.entries); } }
@@ -249,7 +249,7 @@ int perf_evlist__add_dummy(struct evlist *evlist) .config = PERF_COUNT_SW_DUMMY, .size = sizeof(attr), /* to capture ABI version */ }; -struct evsel *evsel =perf_evsel__new_idx (&attr, evlist->nr_entries); +struct evsel *evsel =perf_evsel__new_idx (&attr, evlist->core.nr_entries);if (evsel ==NULL )return -ENOMEM ;
@@ -266,7 +266,7 @@ static int evlist__add_attrs(struct evlist *evlist,size_t i;for (i =0 ; i < nr_attrs; i++) { - evsel =perf_evsel__new_idx (attrs + i, evlist->nr_entries + i); + evsel =perf_evsel__new_idx (attrs + i, evlist->core.nr_entries + i);if (evsel ==NULL ) goto out_delete_partial_list;list_add_tail (&evsel->core.node, &head);
@@ -581,7 +581,7 @@ struct evsel *perf_evlist__id2evsel(struct evlist *evlist, u64 id) {struct perf_sample_id *sid; -if (evlist->nr_entries ==1 || !id) +if (evlist->core.nr_entries ==1 || !id)return perf_evlist__first (evlist); sid =perf_evlist__id2sid (evlist, id);
@@ -639,7 +639,7 @@ struct evsel *perf_evlist__event2evsel(struct evlist *evlist,int hash;u64 id; -if (evlist->nr_entries ==1 ) +if (evlist->core.nr_entries ==1 )return first; if (!first->attr.sample_id_all &&
@@ -1222,7 +1222,7 @@ bool perf_evlist__valid_sample_type(struct evlist *evlist) {struct evsel *pos; -if (evlist->nr_entries ==1 ) +if (evlist->core.nr_entries ==1 )return true;if (evlist->id_pos <0 || evlist->is_pos <0 )
@@ -1849,7 +1849,7 @@ int perf_evlist__add_sb_event(struct evlist **evlist, attr->sample_id_all =1 ; } - evsel =perf_evsel__new_idx (attr, (*evlist)->nr_entries); + evsel =perf_evsel__new_idx (attr, (*evlist)->core.nr_entries);if (!evsel) goto out_err;
tools/perf/util/evlist.h +0 -1
@@ -28,7 +28,6 @@ struct record_opts;struct evlist {struct perf_evlist core;struct hlist_head heads[PERF_EVLIST__HLIST_SIZE ]; -int nr_entries;int nr_groups;int nr_mmaps;bool enabled;
tools/perf/util/header.c +2 -2
@@ -476,7 +476,7 @@ static int write_event_desc(struct feat_fd *ff,u32 nre, nri, sz;int ret; - nre = evlist->nr_entries; + nre = evlist->core.nr_entries;/* * write number of events
@@ -3100,7 +3100,7 @@ int perf_session__write_header(struct perf_session *session, .attr_size = sizeof(f_attr), .attrs = { .offset = attr_offset, - .size = evlist->nr_entries * sizeof(f_attr), + .size = evlist->core.nr_entries * sizeof(f_attr), }, .data = { .offset = header->data_offset,
tools/perf/util/parse-events.c +2 -2
@@ -1909,7 +1909,7 @@ int parse_events(struct evlist *evlist, const char *str, {struct parse_events_state parse_state = { .list =LIST_HEAD_INIT (parse_state.list), - .idx = evlist->nr_entries, + .idx = evlist->core.nr_entries, .error = err, .evlist = evlist, };
@@ -2040,7 +2040,7 @@ foreach_evsel_in_last_glob(struct evlist *evlist,* * So no need to WARN here, let *func do this. */ -if (evlist->nr_entries >0 ) +if (evlist->core.nr_entries >0 ) last =perf_evlist__last (evlist); do {
tools/perf/util/python.c +4 -4
@@ -973,10 +973,10 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist,Py_INCREF (pevsel); evsel = &((struct pyrf_evsel *)pevsel)->evsel; - evsel->idx = evlist->nr_entries; + evsel->idx = evlist->core.nr_entries;evlist__add (evlist, evsel); -return Py_BuildValue ("i" , evlist->nr_entries); +return Py_BuildValue ("i" , evlist->core.nr_entries); }static struct perf_mmap *get_md (struct evlist *evlist,int cpu)
@@ -1112,7 +1112,7 @@ static Py_ssize_t pyrf_evlist__length(PyObject *obj) {struct pyrf_evlist *pevlist = (void *)obj; -return pevlist->evlist.nr_entries; +return pevlist->evlist.core.nr_entries; }static PyObject *pyrf_evlist__item (PyObject *obj,Py_ssize_t i)
@@ -1120,7 +1120,7 @@ static PyObject *pyrf_evlist__item(PyObject *obj, Py_ssize_t i)struct pyrf_evlist *pevlist = (void *)obj;struct evsel *pos; -if (i >= pevlist->evlist.nr_entries) +if (i >= pevlist->evlist.core.nr_entries)return NULL ;evlist__for_each_entry (&pevlist->evlist, pos) {
tools/perf/util/record.c +1 -1
@@ -166,7 +166,7 @@ void perf_evlist__config(struct evlist *evlist, struct record_opts *opts,*/ use_sample_identifier =perf_can_sample_identifier (); sample_id = true; - }else if (evlist->nr_entries >1 ) { + }else if (evlist->core.nr_entries >1 ) {struct evsel *first =perf_evlist__first (evlist);evlist__for_each_entry (evlist, evsel) {
tools/perf/util/sort.c +1 -1
@@ -2323,7 +2323,7 @@ static struct evsel *find_evsel(struct evlist *evlist, char *event_name)if (event_name[0 ] =='%' ) {int nr =strtol (event_name+1 ,NULL ,0 ); -if (nr > evlist->nr_entries) +if (nr > evlist->core.nr_entries)return NULL ; evsel =perf_evlist__first (evlist);
tools/perf/util/top.c +1 -1
@@ -70,7 +70,7 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size) esamples_percent); } -if (top->evlist->nr_entries ==1 ) { +if (top->evlist->core.nr_entries ==1 ) {struct evsel *first =perf_evlist__first (top->evlist); ret += SNPRINTF(bf + ret, size - ret, "%" PRIu64 "%s ", (uint64_t)first->attr.sample_period,
Jiri Olsa
reviewerPATCH 42/79 libperf: Add attr to perf_evsel
In reply to Jiri OlsaMoving perf_event_attr struct into perf_evsel struct.
--- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 6 +- tools/perf/arch/x86/util/auxtrace.c | 4 +- tools/perf/arch/x86/util/intel-bts.c | 16 +- tools/perf/arch/x86/util/intel-pt.c | 40 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-inject.c | 14 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-script.c | 52 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-timechart.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 32 +- tools/perf/lib/evsel.c | 3 +- tools/perf/lib/include/internal/evsel.h | 4 + tools/perf/lib/include/perf/evsel.h | 4 +- tools/perf/tests/code-reading.c | 6 +- tools/perf/tests/event-times.c | 8 +- tools/perf/tests/keep-tracking.c | 6 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/parse-events.c | 872 +++++++++--------- tools/perf/tests/sample-parsing.c | 6 +- tools/perf/tests/switch-tracking.c | 8 +- tools/perf/tests/task-exit.c | 14 +- tools/perf/ui/browsers/res_sample.c | 2 +- tools/perf/ui/browsers/scripts.c | 2 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/bpf-loader.c | 2 +- tools/perf/util/data-convert-bt.c | 14 +- tools/perf/util/db-export.c | 4 +- tools/perf/util/evlist.c | 50 +- tools/perf/util/evsel.c | 167 ++-- tools/perf/util/evsel.h | 17 +- tools/perf/util/evsel_fprintf.c | 8 +- tools/perf/util/header.c | 28 +- tools/perf/util/hist.c | 2 +- tools/perf/util/intel-bts.c | 18 +- tools/perf/util/intel-pt.c | 50 +- tools/perf/util/jitdump.c | 4 +- tools/perf/util/machine.c | 4 +- tools/perf/util/parse-events.c | 40 +- tools/perf/util/python.c | 6 +- tools/perf/util/record.c | 16 +- tools/perf/util/s390-cpumsf.c | 2 +- tools/perf/util/s390-sample-raw.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 6 +- .../scripting-engines/trace-event-python.c | 14 +- tools/perf/util/session.c | 20 +- tools/perf/util/sort.c | 12 +- tools/perf/util/stat-display.c | 8 +- tools/perf/util/stat-shadow.c | 30 +- tools/perf/util/stat.c | 2 +- tools/perf/util/top.c | 2 +- tools/perf/util/trace-event-info.c | 6 +- 54 files changed, 827 insertions(+), 822 deletions(-)
tools/perf/arch/x86/tests/perf-time-to-tsc.c +3 -3
@@ -79,9 +79,9 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ;CHECK__ (evlist__open (evlist));
tools/perf/arch/x86/util/auxtrace.c +2 -2
@@ -29,9 +29,9 @@ struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist, intel_bts_pmu =perf_pmu__find (INTEL_BTS_PMU_NAME );evlist__for_each_entry (evlist, evsel) { -if (intel_pt_pmu && evsel->attr.type == intel_pt_pmu->type) +if (intel_pt_pmu && evsel->core.attr.type == intel_pt_pmu->type) found_pt = true; -if (intel_bts_pmu && evsel->attr.type == intel_bts_pmu->type) +if (intel_bts_pmu && evsel->core.attr.type == intel_bts_pmu->type) found_bts = true; }
tools/perf/arch/x86/util/intel-bts.c +8 -8
@@ -113,13 +113,13 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, btsr->snapshot_mode = opts->auxtrace_snapshot_mode;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_bts_pmu->type) { +if (evsel->core.attr.type == intel_bts_pmu->type) {if (intel_bts_evsel) {pr_err ("There may be only one " INTEL_BTS_PMU_NAME " event\n" );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; intel_bts_evsel = evsel; opts->full_auxtrace = true; }
@@ -231,8 +231,8 @@ static int intel_bts_recording_options(struct auxtrace_record *itr,perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ; }return 0 ;
@@ -316,7 +316,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return evsel__disable (evsel); }return -EINVAL ;
@@ -329,7 +329,7 @@ static int intel_bts_snapshot_finish(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return evsel__enable (evsel); }return -EINVAL ;
@@ -411,7 +411,7 @@ static int intel_bts_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return perf_evlist__enable_event_idx (btsr->evlist, evsel, idx); }
tools/perf/arch/x86/util/intel-pt.c +20 -20
@@ -122,8 +122,8 @@ static int intel_pt_read_config(struct perf_pmu *intel_pt_pmu, const char *str,return -EINVAL ;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) { - *res =intel_pt_masked_bits (mask, evsel->attr.config); +if (evsel->core.attr.type == intel_pt_pmu->type) { + *res =intel_pt_masked_bits (mask, evsel->core.attr.config);return 0 ; } }
@@ -274,7 +274,7 @@ static const char *intel_pt_find_filter(struct evlist *evlist,struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) +if (evsel->core.attr.type == intel_pt_pmu->type)return evsel->filter; }
@@ -526,26 +526,26 @@ static int intel_pt_validate_config(struct perf_pmu *intel_pt_pmu,* sets pt=0, which avoids senseless kernel errors. */ if (perf_pmu__scan_file (intel_pt_pmu,"format/pt" ,"%c" , &c) ==1 && - !(evsel->attr.config &1 )) { + !(evsel->core.attr.config &1 )) {pr_warning ("pt=0 doesn't make sense, forcing pt=1\n" ); - evsel->attr.config |=1 ; + evsel->core.attr.config |=1 ; } err =intel_pt_val_config_term (intel_pt_pmu,"caps/cycle_thresholds" ,"cyc_thresh" ,"caps/psb_cyc" , - evsel->attr.config); + evsel->core.attr.config);if (err)return err; err =intel_pt_val_config_term (intel_pt_pmu,"caps/mtc_periods" ,"mtc_period" ,"caps/mtc" , - evsel->attr.config); + evsel->core.attr.config);if (err)return err;return intel_pt_val_config_term (intel_pt_pmu,"caps/psb_periods" ,"psb_period" ,"caps/psb_cyc" , - evsel->attr.config); + evsel->core.attr.config); } static int intel_pt_recording_options(struct auxtrace_record *itr,
@@ -566,13 +566,13 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, ptr->snapshot_mode = opts->auxtrace_snapshot_mode;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) { +if (evsel->core.attr.type == intel_pt_pmu->type) {if (intel_pt_evsel) {pr_err ("There may be only one " INTEL_PT_PMU_NAME " event\n" );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; intel_pt_evsel = evsel; opts->full_auxtrace = true; }
@@ -670,7 +670,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,intel_pt_parse_terms (&intel_pt_pmu->format,"tsc" , &tsc_bit); -if (opts->full_auxtrace && (intel_pt_evsel->attr.config & tsc_bit)) +if (opts->full_auxtrace && (intel_pt_evsel->core.attr.config & tsc_bit)) have_timing_info = true;else have_timing_info = false;
@@ -693,9 +693,9 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, switch_evsel =perf_evlist__last (evlist); - switch_evsel->attr.freq =0 ; - switch_evsel->attr.sample_period =1 ; - switch_evsel->attr.context_switch =1 ; + switch_evsel->core.attr.freq =0 ; + switch_evsel->core.attr.sample_period =1 ; + switch_evsel->core.attr.context_switch =1 ; switch_evsel->system_wide = true; switch_evsel->no_aux_samples = true;
@@ -753,8 +753,8 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ; tracking_evsel->no_aux_samples = true;if (need_immediate)
@@ -787,7 +787,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return evsel__disable (evsel); }return -EINVAL ;
@@ -800,7 +800,7 @@ static int intel_pt_snapshot_finish(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return evsel__enable (evsel); }return -EINVAL ;
@@ -1073,7 +1073,7 @@ static int intel_pt_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return perf_evlist__enable_event_idx (ptr->evlist, evsel, idx); }
tools/perf/builtin-evlist.c +1 -1
@@ -36,7 +36,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *detailsevlist__for_each_entry (session->evlist, pos) {perf_evsel__fprintf (pos, details, stdout); -if (pos->attr.type ==PERF_TYPE_TRACEPOINT ) +if (pos->core.attr.type ==PERF_TYPE_TRACEPOINT ) has_tracepoint = true; }
tools/perf/builtin-inject.c +7 -7
@@ -530,8 +530,8 @@ static int perf_inject__sched_stat(struct perf_tool *tool, sample_sw.period = sample->period; sample_sw.time = sample->time; -perf_event__synthesize_sample (event_sw, evsel->attr.sample_type, - evsel->attr.read_format, &sample_sw); +perf_event__synthesize_sample (event_sw, evsel->core.attr.sample_type, + evsel->core.attr.read_format, &sample_sw);build_id__mark_dso_hit (tool, event_sw, &sample_sw, evsel, machine);return perf_event__repipe (tool, event_sw, &sample_sw, machine); }
@@ -544,7 +544,7 @@ static void sig_handler(int sig __maybe_unused)static int perf_evsel__check_stype (struct evsel *evsel,u64 sample_type,const char *sample_msg) { -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;const char *name =perf_evsel__name (evsel);if (!(attr->sample_type & sample_type)) {
@@ -578,8 +578,8 @@ static void strip_init(struct perf_inject *inject)static bool has_tracking (struct evsel *evsel) { -return evsel->attr.mmap || evsel->attr.mmap2 || evsel->attr.comm || - evsel->attr.task; +return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || + evsel->core.attr.task; }#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \
@@ -603,8 +603,8 @@ static bool ok_to_remove(struct evlist *evlist,evlist__for_each_entry (evlist, evsel) {if (evsel->handler != drop_sample) { cnt +=1 ; -if ((evsel->attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->attr.sample_type &COMPAT_MASK )) +if ((evsel->core.attr.sample_type &COMPAT_MASK ) == + (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) ok = true; } }
tools/perf/builtin-kvm.c +1 -1
@@ -1022,7 +1022,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)* This command processes KVM tracepoints from host only */ evlist__for_each_entry (evlist, pos) { -struct perf_event_attr *attr = &pos->attr; +struct perf_event_attr *attr = &pos->core.attr;/* make sure these *are* set */ perf_evsel__set_sample_bit (pos,TID );
tools/perf/builtin-record.c +1 -1
@@ -732,7 +732,7 @@ static int record__open(struct record *rec) pos->tracking =0 ; pos =perf_evlist__last (evlist); pos->tracking =1 ; - pos->attr.enable_on_exec =1 ; + pos->core.attr.enable_on_exec =1 ; }perf_evlist__config (evlist, opts, &callchain_param);
tools/perf/builtin-script.c +26 -26
191 lines not on this page · raw message
tools/perf/builtin-stat.c +1 -1
@@ -391,7 +391,7 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *infstatic bool perf_evsel__should_store_id (struct evsel *counter) { -return STAT_RECORD || counter->attr.read_format &PERF_FORMAT_ID ; +return STAT_RECORD || counter->core.attr.read_format &PERF_FORMAT_ID ; } static bool is_target_alive(struct target *_target,
tools/perf/builtin-timechart.c +1 -1
@@ -557,7 +557,7 @@ static int process_sample_event(struct perf_tool *tool, { struct timechart *tchart = container_of(tool, struct timechart, tool); -if (evsel->attr.sample_type &PERF_SAMPLE_TIME ) { +if (evsel->core.attr.sample_type &PERF_SAMPLE_TIME ) {if (!tchart->first_time || tchart->first_time > sample->time) tchart->first_time = sample->time;if (tchart->last_time < sample->time)
tools/perf/builtin-top.c +1 -1
@@ -966,7 +966,7 @@ static int perf_top_overwrite_fallback(struct perf_top *top,return 0 ;evlist__for_each_entry (evlist, counter) - counter->attr.write_backward = false; + counter->core.attr.write_backward = false; opts->overwrite = false;pr_debug2 ("fall back to non-overwrite mode\n" );return 1 ;
tools/perf/builtin-trace.c +16 -16
@@ -2058,8 +2058,8 @@ static int trace__resolve_callchain(struct trace *trace, struct evsel *evsel, struct callchain_cursor *cursor) {struct addr_location al; -int max_stack = evsel->attr.sample_max_stack ? - evsel->attr.sample_max_stack : +int max_stack = evsel->core.attr.sample_max_stack ? + evsel->core.attr.sample_max_stack : trace->max_stack;int err;
@@ -2474,7 +2474,7 @@ static int trace__pgfault(struct trace *trace,if (ttrace ==NULL ) goto out_put; -if (evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ) +if (evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ) ttrace->pfmaj++;else ttrace->pfmin++;
@@ -2487,7 +2487,7 @@ static int trace__pgfault(struct trace *trace,trace__fprintf_entry_head (trace, thread,0 , true, sample->time, trace->output);fprintf (trace->output,"%sfault [" , - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ? + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ?"maj" :"min" );print_location (trace->output, sample, &al, false, true);
@@ -2535,7 +2535,7 @@ static void trace__set_base_time(struct trace *trace,* appears in our event stream (vfs_getname comes to mind). */ if (trace->base_time ==0 && !trace->full_time && - (evsel->attr.sample_type &PERF_SAMPLE_TIME )) + (evsel->core.attr.sample_type &PERF_SAMPLE_TIME )) trace->base_time = sample->time; }
@@ -2694,7 +2694,7 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, sttrace__set_base_time (trace, evsel, sample); -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT && +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT && sample->raw_data ==NULL ) { fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n", perf_evsel__name(evsel), sample->tid,
@@ -2740,7 +2740,7 @@ static int trace__add_syscall_newtp(struct trace *trace)* leading to the syscall, allow overriding that for * debugging reasons using --kernel_syscall_callchains */ - sys_exit->attr.exclude_callchain_kernel =1 ; + sys_exit->core.attr.exclude_callchain_kernel =1 ; } trace->syscalls.events.sys_enter = sys_enter;
@@ -3413,18 +3413,18 @@ static int trace__run(struct trace *trace, int argc, const char **argv) trace->multiple_threads =thread_map__pid (evlist->threads,0 ) ==-1 || evlist->threads->nr >1 || -perf_evlist__first (evlist)->attr.inherit; +perf_evlist__first (evlist)->core.attr.inherit;/* -* Now that we already used evsel->attr to ask the kernel to setup the -* events, lets reuse evsel->attr.sample_max_stack as the limit in +* Now that we already used evsel->core.attr to ask the kernel to setup the +* events, lets reuse evsel->core.attr.sample_max_stack as the limit in * trace__resolve_callchain(), allowing per-event max-stack settings * to override an explicitly set --max-stack global setting. */ evlist__for_each_entry (evlist, evsel) {if (evsel__has_callchain (evsel) && - evsel->attr.sample_max_stack ==0 ) - evsel->attr.sample_max_stack = trace->max_stack; + evsel->core.attr.sample_max_stack ==0 ) + evsel->core.attr.sample_max_stack = trace->max_stack; } again: before = trace->nr_events;
@@ -3617,10 +3617,10 @@ static int trace__replay(struct trace *trace) }evlist__for_each_entry (session->evlist, evsel) { -if (evsel->attr.type ==PERF_TYPE_SOFTWARE && - (evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ || - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MIN || - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS )) +if (evsel->core.attr.type ==PERF_TYPE_SOFTWARE && + (evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ || + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MIN || + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS )) evsel->handler = trace__pgfault; }
tools/perf/lib/evsel.c +2 -1
@@ -3,7 +3,8 @@#include <linux/list.h> #include <internal/evsel.h> -void perf_evsel__init (struct perf_evsel *evsel) +void perf_evsel__init (struct perf_evsel *evsel,struct perf_event_attr *attr) {INIT_LIST_HEAD (&evsel->node); + evsel->attr = *attr; }
tools/perf/lib/include/internal/evsel.h +4 -0
@@ -2,8 +2,12 @@#ifndef __LIBPERF_INTERNAL_EVSEL_H#define __LIBPERF_INTERNAL_EVSEL_H +#include <linux/types.h> +#include <linux/perf_event.h> +struct perf_evsel {struct list_head node; +struct perf_event_attr attr; };#endif /* __LIBPERF_INTERNAL_EVSEL_H */
tools/perf/lib/include/perf/evsel.h +3 -1
@@ -2,10 +2,12 @@#ifndef __LIBPERF_EVSEL_H#define __LIBPERF_EVSEL_H +#include <linux/perf_event.h> #include <perf/core.h> struct perf_evsel ; -LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel); +LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel, +struct perf_event_attr *attr);#endif /* __LIBPERF_EVSEL_H */
tools/perf/tests/code-reading.c +3 -3
@@ -642,9 +642,9 @@ static int do_test_code_reading(bool try_kcore) evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ; ret =evlist__open (evlist);if (ret <0 ) {
tools/perf/tests/event-times.c +4 -4
@@ -36,7 +36,7 @@ static int attach__enable_on_exec(struct evlist *evlist)return err; } - evsel->attr.enable_on_exec =1 ; + evsel->core.attr.enable_on_exec =1 ; err =evlist__open (evlist);if (err <0 ) {
@@ -68,7 +68,7 @@ static int attach__current_disabled(struct evlist *evlist)return -1 ; } - evsel->attr.disabled =1 ; + evsel->core.attr.disabled =1 ; err =perf_evsel__open_per_thread (evsel, threads);if (err) {
@@ -121,7 +121,7 @@ static int attach__cpu_disabled(struct evlist *evlist)return -1 ; } - evsel->attr.disabled =1 ; + evsel->core.attr.disabled =1 ; err =perf_evsel__open_per_cpu (evsel, cpus);if (err) {
@@ -179,7 +179,7 @@ static int test_times(int (attach)(struct evlist *), } evsel =perf_evlist__last (evlist); - evsel->attr.read_format |= + evsel->core.attr.read_format |=PERF_FORMAT_TOTAL_TIME_ENABLED |PERF_FORMAT_TOTAL_TIME_RUNNING ;
tools/perf/tests/keep-tracking.c +3 -3
@@ -90,9 +90,9 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ;if (evlist__open (evlist) <0 ) {pr_debug ("Unable to open dummy and cycles event\n" );
tools/perf/tests/mmap-basic.c +1 -1
@@ -79,7 +79,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse goto out_delete_evlist; } - evsels[i]->attr.wakeup_events =1 ; + evsels[i]->core.attr.wakeup_events =1 ;perf_evsel__set_sample_id (evsels[i], false);evlist__add (evlist, evsels[i]);
tools/perf/tests/parse-events.c +436 -436
1,420 lines not on this page · raw message
tools/perf/tests/sample-parsing.c +3 -3
@@ -155,7 +155,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) {struct evsel evsel = { .needs_swap = false, - .attr = { + .core.attr = { .sample_type = sample_type, .read_format = read_format, },
@@ -221,10 +221,10 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)int err, ret =-1 ;if (sample_type &PERF_SAMPLE_REGS_USER ) - evsel.attr.sample_regs_user = sample_regs; + evsel.core.attr.sample_regs_user = sample_regs;if (sample_type &PERF_SAMPLE_REGS_INTR ) - evsel.attr.sample_regs_intr = sample_regs; + evsel.core.attr.sample_regs_intr = sample_regs;for (i =0 ; i <sizeof (regs); i++) *(i + (u8 *)regs) = i &0xfe ;
tools/perf/tests/switch-tracking.c +4 -4
@@ -420,8 +420,8 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ;perf_evsel__set_sample_bit (tracking_evsel,TIME );
@@ -435,7 +435,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ }/* Check tracking event is tracking */ -if (!tracking_evsel->attr.mmap || !tracking_evsel->attr.comm) { +if (!tracking_evsel->core.attr.mmap || !tracking_evsel->core.attr.comm) {pr_debug ("Tracking event not tracking\n" ); goto out_err; }
@@ -443,7 +443,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_/* Check non-tracking events are not tracking */ evlist__for_each_entry (evlist, evsel) {if (evsel != tracking_evsel) { -if (evsel->attr.mmap || evsel->attr.comm) { +if (evsel->core.attr.mmap || evsel->core.attr.comm) {pr_debug ("Non-tracking event is tracking\n" ); goto out_err; }
tools/perf/tests/task-exit.c +7 -7
@@ -84,16 +84,16 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused } evsel =perf_evlist__first (evlist); - evsel->attr.task =1 ; + evsel->core.attr.task =1 ;#ifdef __s390x__ - evsel->attr.sample_freq =1000000 ; + evsel->core.attr.sample_freq =1000000 ;#else - evsel->attr.sample_freq =1 ; + evsel->core.attr.sample_freq =1 ;#endif - evsel->attr.inherit =0 ; - evsel->attr.watermark =0 ; - evsel->attr.wakeup_events =1 ; - evsel->attr.exclude_kernel =1 ; + evsel->core.attr.inherit =0 ; + evsel->core.attr.watermark =0 ; + evsel->core.attr.wakeup_events =1 ; + evsel->core.attr.exclude_kernel =1 ; err =evlist__open (evlist);if (err <0 ) {
tools/perf/ui/browsers/res_sample.c +1 -1
@@ -66,7 +66,7 @@ int res_sample_browse(struct res_sample *res_samples, int num_res,timestamp__scnprintf_nsec (r->time, tsample,sizeof tsample); -attr_to_script (extra_format, &evsel->attr); +attr_to_script (extra_format, &evsel->core.attr); if (asprintf(&cmd, "%s script %s%s --time %s %s%s %s%s --ns %s %s %s %s %s | less +/%s", perf,
tools/perf/ui/browsers/scripts.c +1 -1
@@ -100,7 +100,7 @@ static int list_scripts(char *script_name, bool *custom,return -1 ;if (evsel) -attr_to_script (scriptc.extra_format, &evsel->attr); +attr_to_script (scriptc.extra_format, &evsel->core.attr);add_script_option ("Show individual samples" ,"" , &scriptc);add_script_option ("Show individual samples with assembler" ,"-F +insn --xed" , &scriptc);
tools/perf/util/auxtrace.c +1 -1
@@ -2140,7 +2140,7 @@ static struct perf_pmu *perf_evsel__find_pmu(struct evsel *evsel)struct perf_pmu *pmu =NULL ;while ((pmu =perf_pmu__scan (pmu)) !=NULL ) { -if (pmu->type == evsel->attr.type) +if (pmu->type == evsel->core.attr.type)break ; }
tools/perf/util/bpf-loader.c +1 -1
@@ -1421,7 +1421,7 @@ apply_config_evsel_for_key(const char *name, int map_fd, void *pkey,return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTDIM ; } - attr = &evsel->attr; + attr = &evsel->core.attr;if (attr->inherit) {pr_debug ("ERROR: Can't put inherit event into map %s\n" , name);return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTINH ;
tools/perf/util/data-convert-bt.c +7 -7
@@ -587,7 +587,7 @@ static int add_generic_values(struct ctf_writer *cw,struct evsel *evsel, struct perf_sample *sample) { - u64 type = evsel->attr.sample_type; + u64 type = evsel->core.attr.sample_type;int ret;/*
@@ -757,7 +757,7 @@ static int get_sample_cpu(struct ctf_writer *cw, struct perf_sample *sample, {int cpu =0 ; -if (evsel->attr.sample_type &PERF_SAMPLE_CPU ) +if (evsel->core.attr.sample_type &PERF_SAMPLE_CPU ) cpu = sample->cpu;if (cpu > cw->stream_cnt) {
@@ -795,7 +795,7 @@ static int process_sample_event(struct perf_tool *tool,struct bt_ctf_event_class *event_class;struct bt_ctf_event *event;int ret; -unsigned long type = evsel->attr.sample_type; +unsigned long type = evsel->core.attr.sample_type;if (WARN_ONCE (!priv,"Failed to setup all events.\n" ))return 0 ;
@@ -820,7 +820,7 @@ static int process_sample_event(struct perf_tool *tool,if (ret)return -1 ; -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT ) { +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) { ret =add_tracepoint_values (cw, event_class, event, evsel, sample);if (ret)
@@ -1087,7 +1087,7 @@ static int add_bpf_output_types(struct ctf_writer *cw,static int add_generic_types (struct ctf_writer *cw,struct evsel *evsel,struct bt_ctf_event_class *event_class) { -u64 type = evsel->attr.sample_type; +u64 type = evsel->core.attr.sample_type;/* * missing:
@@ -1157,7 +1157,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)const char *name =perf_evsel__name (evsel);int ret; -pr ("Adding event '%s' (type %d)\n" , name, evsel->attr.type); +pr ("Adding event '%s' (type %d)\n" , name, evsel->core.attr.type); event_class =bt_ctf_event_class_create (name);if (!event_class)
@@ -1167,7 +1167,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)if (ret) goto err; -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT ) { +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) { ret =add_tracepoint_types (cw, evsel, event_class);if (ret) goto err;
tools/perf/util/db-export.c +2 -2
@@ -388,8 +388,8 @@ int db_export__sample(struct db_export *dbe, union perf_event *event, } } -if ((evsel->attr.sample_type &PERF_SAMPLE_ADDR ) && -sample_addr_correlates_sym (&evsel->attr)) { +if ((evsel->core.attr.sample_type &PERF_SAMPLE_ADDR ) && +sample_addr_correlates_sym (&evsel->core.attr)) {struct addr_location addr_al;thread__resolve (thread, &addr_al, sample);
tools/perf/util/evlist.c +25 -25
172 lines not on this page · raw message
tools/perf/util/evsel.c +83 -84
522 lines not on this page · raw message
tools/perf/util/evsel.h +8 -9
@@ -103,7 +103,6 @@ struct bpf_object;struct evsel {struct perf_evsel core;struct evlist *evlist; -struct perf_event_attr attr;char *filter;struct xyarray *fd;struct xyarray *sample_id;
@@ -327,21 +326,21 @@ u64 format_field__intval(struct tep_format_field *field, struct perf_sample *samstruct tep_format_field *perf_evsel__field (struct evsel *evsel,const char *name);#define perf_evsel__match (evsel, t, c) \ - (evsel->attr.type == PERF_TYPE_##t && \ - evsel->attr.config == PERF_COUNT_##c) + (evsel->core.attr.type == PERF_TYPE_##t && \ + evsel->core.attr.config == PERF_COUNT_##c)static inline bool perf_evsel__match2 (struct evsel *e1,struct evsel *e2) { -return (e1->attr.type == e2->attr.type) && - (e1->attr.config == e2->attr.config); +return (e1->core.attr.type == e2->core.attr.type) && + (e1->core.attr.config == e2->core.attr.config); }#define perf_evsel__cmp (a, b) \ ((a) && \ (b) && \ - (a)->attr.type == (b)->attr.type && \ - (a)->attr.config == (b)->attr.config) + (a)->core.attr.type == (b)->core.attr.type && \ + (a)->core.attr.config == (b)->core.attr.config)int perf_evsel__read (struct evsel *evsel,int cpu,int thread,struct perf_counts_values *count);
@@ -490,12 +489,12 @@ for ((_evsel) = _leader; \static inline bool perf_evsel__has_branch_callstack (const struct evsel *evsel) { -return evsel->attr.branch_sample_type &PERF_SAMPLE_BRANCH_CALL_STACK ; +return evsel->core.attr.branch_sample_type &PERF_SAMPLE_BRANCH_CALL_STACK ; }static inline bool evsel__has_callchain (const struct evsel *evsel) { -return (evsel->attr.sample_type &PERF_SAMPLE_CALLCHAIN ) !=0 ; +return (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) !=0 ; }typedef int (*attr__fprintf_f )(FILE *,const char *,const char *,void *);
tools/perf/util/evsel_fprintf.c +4 -4
@@ -60,22 +60,22 @@ int perf_evsel__fprintf(struct evsel *evsel, printed +=fprintf (fp,"%s" ,perf_evsel__name (evsel));if (details->verbose) { - printed +=perf_event_attr__fprintf (fp, &evsel->attr, + printed +=perf_event_attr__fprintf (fp, &evsel->core.attr, __print_attr__fprintf, &first); }else if (details->freq) {const char *term ="sample_freq" ; -if (!evsel->attr.freq) +if (!evsel->core.attr.freq) term ="sample_period" ; printed +=comma_fprintf (fp, &first," %s=%" PRIu64, - term, (u64 )evsel->attr.sample_freq); + term, (u64 )evsel->core.attr.sample_freq); }
Lines of this file are not shown. View the raw message.
tools/perf/util/intel-pt.c +25 -25
50 lines not on this page · raw message
tools/perf/util/scripting-engines/trace-event-perl.c +3 -3
Lines of this file are not shown. View the raw message.
tools/perf/util/scripting-engines/trace-event-python.c +7 -7
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0
Part of the diff is not shown here. View the raw message.
Re: [PATCH 42/79] libperf: Add attr to perf_evsel
Em Sun, Jul 21, 2019 at 01:24:29PM +0200, Jiri Olsa escreveu:
Quoted 1 line
Moving
perf_event_attrstruct intoperf_evselstruct.
Fixed up these:
tools/perf/arch/arm/util/auxtrace.c
tools/perf/arch/arm/util/cs-etm.c
tools/perf/arch/arm64/util/arm-spe.c
tools/perf/arch/s390/util/auxtrace.c
tools/perf/util/cs-etm.c
I'm now building one by one with these:
[perfbuilder@quaco ~]$ podman ps | grep -- -x-
218b378829bc localhost/acmel/linux-perf-tools-build-ubuntu:18.04-x-sparc64 /bin/sh 14 minutes ago Up 14 minutes ago hardcore_wilson ab3bae9193c9 localhost/acmel/linux-perf-tools-build-ubuntu:18.04-x-powerpc /bin/sh 26 minutes ago Up 26 minutes ago happy_mcclintock 99284251237b localhost/acmel/linux-perf-tools-build-ubuntu:18.04-x-powerpc64 /bin/sh 28 minutes ago Up 28 minutes ago boring_bell f5ea4fcc2319 localhost/acmel/linux-perf-tools-build-ubuntu:18.04-x-s390 /bin/sh 28 minutes ago Up 28 minutes ago nostalgic_germain 7c190a6e7539 localhost/acmel/linux-perf-tools-build-fedora:30-x-ARC-glibc /bin/sh 32 minutes ago Up 32 minutes ago pensive_clarke 126d7858f5b2 localhost/acmel/linux-perf-tools-build-ubuntu:19.04-x-arm64 /bin/sh 35 minutes ago Up 35 minutes ago jovial_allen
[perfbuilder@quaco ~]$
Quoted 4,420 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 6 +- tools/perf/arch/x86/util/auxtrace.c | 4 +- tools/perf/arch/x86/util/intel-bts.c | 16 +- tools/perf/arch/x86/util/intel-pt.c | 40 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-inject.c | 14 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-script.c | 52 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-timechart.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 32 +- tools/perf/lib/evsel.c | 3 +- tools/perf/lib/include/internal/evsel.h | 4 + tools/perf/lib/include/perf/evsel.h | 4 +- tools/perf/tests/code-reading.c | 6 +- tools/perf/tests/event-times.c | 8 +- tools/perf/tests/keep-tracking.c | 6 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/parse-events.c | 872 +++++++++--------- tools/perf/tests/sample-parsing.c | 6 +- tools/perf/tests/switch-tracking.c | 8 +- tools/perf/tests/task-exit.c | 14 +- tools/perf/ui/browsers/res_sample.c | 2 +- tools/perf/ui/browsers/scripts.c | 2 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/bpf-loader.c | 2 +- tools/perf/util/data-convert-bt.c | 14 +- tools/perf/util/db-export.c | 4 +- tools/perf/util/evlist.c | 50 +- tools/perf/util/evsel.c | 167 ++-- tools/perf/util/evsel.h | 17 +- tools/perf/util/evsel_fprintf.c | 8 +- tools/perf/util/header.c | 28 +- tools/perf/util/hist.c | 2 +- tools/perf/util/intel-bts.c | 18 +- tools/perf/util/intel-pt.c | 50 +- tools/perf/util/jitdump.c | 4 +- tools/perf/util/machine.c | 4 +- tools/perf/util/parse-events.c | 40 +- tools/perf/util/python.c | 6 +- tools/perf/util/record.c | 16 +- tools/perf/util/s390-cpumsf.c | 2 +- tools/perf/util/s390-sample-raw.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 6 +- .../scripting-engines/trace-event-python.c | 14 +- tools/perf/util/session.c | 20 +- tools/perf/util/sort.c | 12 +- tools/perf/util/stat-display.c | 8 +- tools/perf/util/stat-shadow.c | 30 +- tools/perf/util/stat.c | 2 +- tools/perf/util/top.c | 2 +- tools/perf/util/trace-event-info.c | 6 +- 54 files changed, 827 insertions(+), 822 deletions(-)tools/perf/arch/x86/tests/perf-time-to-tsc.c +3
-3@@ -79,9 +79,9 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ;CHECK__ (evlist__open (evlist));tools/perf/arch/x86/util/auxtrace.c +2
-2@@ -29,9 +29,9 @@ struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist, intel_bts_pmu =perf_pmu__find (INTEL_BTS_PMU_NAME );evlist__for_each_entry (evlist, evsel) { -if (intel_pt_pmu && evsel->attr.type == intel_pt_pmu->type) +if (intel_pt_pmu && evsel->core.attr.type == intel_pt_pmu->type) found_pt = true; -if (intel_bts_pmu && evsel->attr.type == intel_bts_pmu->type) +if (intel_bts_pmu && evsel->core.attr.type == intel_bts_pmu->type) found_bts = true; }tools/perf/arch/x86/util/intel-bts.c +8
-8@@ -113,13 +113,13 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, btsr->snapshot_mode = opts->auxtrace_snapshot_mode;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_bts_pmu->type) { +if (evsel->core.attr.type == intel_bts_pmu->type) {if (intel_bts_evsel) {pr_err ("There may be only one " INTEL_BTS_PMU_NAME " event\n" );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; intel_bts_evsel = evsel; opts->full_auxtrace = true; }@@ -231,8 +231,8 @@ static int intel_bts_recording_options(struct auxtrace_record *itr,perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ; }return 0 ;@@ -316,7 +316,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return evsel__disable (evsel); }return -EINVAL ;@@ -329,7 +329,7 @@ static int intel_bts_snapshot_finish(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return evsel__enable (evsel); }return -EINVAL ;@@ -411,7 +411,7 @@ static int intel_bts_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return perf_evlist__enable_event_idx (btsr->evlist, evsel, idx); }tools/perf/arch/x86/util/intel-pt.c +20
-20@@ -122,8 +122,8 @@ static int intel_pt_read_config(struct perf_pmu *intel_pt_pmu, const char *str,return -EINVAL ;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) { - *res =intel_pt_masked_bits (mask, evsel->attr.config); +if (evsel->core.attr.type == intel_pt_pmu->type) { + *res =intel_pt_masked_bits (mask, evsel->core.attr.config);return 0 ; } }@@ -274,7 +274,7 @@ static const char *intel_pt_find_filter(struct evlist *evlist,struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) +if (evsel->core.attr.type == intel_pt_pmu->type)return evsel->filter; }@@ -526,26 +526,26 @@ static int intel_pt_validate_config(struct perf_pmu *intel_pt_pmu,* sets pt=0, which avoids senseless kernel errors. */ if (perf_pmu__scan_file (intel_pt_pmu,"format/pt" ,"%c" , &c) ==1 && - !(evsel->attr.config &1 )) { + !(evsel->core.attr.config &1 )) {pr_warning ("pt=0 doesn't make sense, forcing pt=1\n" ); - evsel->attr.config |=1 ; + evsel->core.attr.config |=1 ; } err =intel_pt_val_config_term (intel_pt_pmu,"caps/cycle_thresholds" ,"cyc_thresh" ,"caps/psb_cyc" , - evsel->attr.config); + evsel->core.attr.config);if (err)return err; err =intel_pt_val_config_term (intel_pt_pmu,"caps/mtc_periods" ,"mtc_period" ,"caps/mtc" , - evsel->attr.config); + evsel->core.attr.config);if (err)return err;return intel_pt_val_config_term (intel_pt_pmu,"caps/psb_periods" ,"psb_period" ,"caps/psb_cyc" , - evsel->attr.config); + evsel->core.attr.config); } static int intel_pt_recording_options(struct auxtrace_record *itr,@@ -566,13 +566,13 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, ptr->snapshot_mode = opts->auxtrace_snapshot_mode;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) { +if (evsel->core.attr.type == intel_pt_pmu->type) {if (intel_pt_evsel) {pr_err ("There may be only one " INTEL_PT_PMU_NAME " event\n" );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; intel_pt_evsel = evsel; opts->full_auxtrace = true; }@@ -670,7 +670,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,intel_pt_parse_terms (&intel_pt_pmu->format,"tsc" , &tsc_bit); -if (opts->full_auxtrace && (intel_pt_evsel->attr.config & tsc_bit)) +if (opts->full_auxtrace && (intel_pt_evsel->core.attr.config & tsc_bit)) have_timing_info = true;else have_timing_info = false;@@ -693,9 +693,9 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, switch_evsel =perf_evlist__last (evlist); - switch_evsel->attr.freq =0 ; - switch_evsel->attr.sample_period =1 ; - switch_evsel->attr.context_switch =1 ; + switch_evsel->core.attr.freq =0 ; + switch_evsel->core.attr.sample_period =1 ; + switch_evsel->core.attr.context_switch =1 ; switch_evsel->system_wide = true; switch_evsel->no_aux_samples = true;@@ -753,8 +753,8 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ; tracking_evsel->no_aux_samples = true;if (need_immediate)@@ -787,7 +787,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return evsel__disable (evsel); }return -EINVAL ;@@ -800,7 +800,7 @@ static int intel_pt_snapshot_finish(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return evsel__enable (evsel); }return -EINVAL ;@@ -1073,7 +1073,7 @@ static int intel_pt_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return perf_evlist__enable_event_idx (ptr->evlist, evsel, idx); }tools/perf/builtin-evlist.c +1
-1@@ -36,7 +36,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *detailsevlist__for_each_entry (session->evlist, pos) {perf_evsel__fprintf (pos, details, stdout); -if (pos->attr.type ==PERF_TYPE_TRACEPOINT ) +if (pos->core.attr.type ==PERF_TYPE_TRACEPOINT ) has_tracepoint = true; }tools/perf/builtin-inject.c +7
-7@@ -530,8 +530,8 @@ static int perf_inject__sched_stat(struct perf_tool *tool, sample_sw.period = sample->period; sample_sw.time = sample->time; -perf_event__synthesize_sample (event_sw, evsel->attr.sample_type, - evsel->attr.read_format, &sample_sw); +perf_event__synthesize_sample (event_sw, evsel->core.attr.sample_type, + evsel->core.attr.read_format, &sample_sw);build_id__mark_dso_hit (tool, event_sw, &sample_sw, evsel, machine);return perf_event__repipe (tool, event_sw, &sample_sw, machine); }@@ -544,7 +544,7 @@ static void sig_handler(int sig __maybe_unused)static int perf_evsel__check_stype (struct evsel *evsel,u64 sample_type,const char *sample_msg) { -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;const char *name =perf_evsel__name (evsel);if (!(attr->sample_type & sample_type)) {@@ -578,8 +578,8 @@ static void strip_init(struct perf_inject *inject)static bool has_tracking (struct evsel *evsel) { -return evsel->attr.mmap || evsel->attr.mmap2 || evsel->attr.comm || - evsel->attr.task; +return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || + evsel->core.attr.task; }#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \@@ -603,8 +603,8 @@ static bool ok_to_remove(struct evlist *evlist,evlist__for_each_entry (evlist, evsel) {if (evsel->handler != drop_sample) { cnt +=1 ; -if ((evsel->attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->attr.sample_type &COMPAT_MASK )) +if ((evsel->core.attr.sample_type &COMPAT_MASK ) == + (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) ok = true; } }tools/perf/builtin-kvm.c +1
-1@@ -1022,7 +1022,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)* This command processes KVM tracepoints from host only */ evlist__for_each_entry (evlist, pos) { -struct perf_event_attr *attr = &pos->attr; +struct perf_event_attr *attr = &pos->core.attr;/* make sure these *are* set */ perf_evsel__set_sample_bit (pos,TID );tools/perf/builtin-record.c +1
-1@@ -732,7 +732,7 @@ static int record__open(struct record *rec) pos->tracking =0 ; pos =perf_evlist__last (evlist); pos->tracking =1 ; - pos->attr.enable_on_exec =1 ; + pos->core.attr.enable_on_exec =1 ; }perf_evlist__config (evlist, opts, &callchain_param);tools/perf/builtin-script.c +26
-26@@ -345,7 +345,7 @@ static int perf_evsel__do_check_stype(struct evsel *evsel, enum perf_output_field field, bool allow_user_set) { -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;int type =output_type (attr->type);const char *evname;@@ -383,7 +383,7 @@ static int perf_evsel__check_stype(struct evsel *evsel,static int perf_evsel__check_attr (struct evsel *evsel,struct perf_session *session) { -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;bool allow_user_set;if (perf_header__has_feat (&session->header,HEADER_STAT ))@@ -418,7 +418,7 @@ static int perf_evsel__check_attr(struct evsel *evsel,return -EINVAL ;if (PRINT_FIELD (SYM ) && - !(evsel->attr.sample_type & (PERF_SAMPLE_IP |PERF_SAMPLE_ADDR ))) { + !(evsel->core.attr.sample_type & (PERF_SAMPLE_IP |PERF_SAMPLE_ADDR ))) {pr_err ("Display of symbols requested but neither sample IP nor " "sample address\navailable. Hence, no addresses to convert " "to symbols.\n" );@@ -430,7 +430,7 @@ static int perf_evsel__check_attr(struct evsel *evsel,return -EINVAL ; }if (PRINT_FIELD (DSO ) && - !(evsel->attr.sample_type & (PERF_SAMPLE_IP |PERF_SAMPLE_ADDR ))) { + !(evsel->core.attr.sample_type & (PERF_SAMPLE_IP |PERF_SAMPLE_ADDR ))) {pr_err ("Display of DSO requested but no address to convert.\n" );return -EINVAL ; }@@ -531,7 +531,7 @@ static int perf_session__check_output_opt(struct perf_session *session)if (evsel ==NULL )continue ; -set_print_ip_opts (&evsel->attr); +set_print_ip_opts (&evsel->core.attr); }if (!no_callchain) {@@ -558,7 +558,7 @@ static int perf_session__check_output_opt(struct perf_session *session) j =PERF_TYPE_TRACEPOINT ;evlist__for_each_entry (session->evlist, evsel) { -if (evsel->attr.type != j) +if (evsel->core.attr.type != j)continue ;if (evsel__has_callchain (evsel)) {@@ -566,7 +566,7 @@ static int perf_session__check_output_opt(struct perf_session *session) output[j].fields |=PERF_OUTPUT_SYM ; output[j].fields |=PERF_OUTPUT_SYMOFFSET ; output[j].fields |=PERF_OUTPUT_DSO ; -set_print_ip_opts (&evsel->attr); +set_print_ip_opts (&evsel->core.attr); goto out; } }@@ -617,7 +617,7 @@ static int perf_sample__fprintf_start(struct perf_sample *sample,struct evsel *evsel, u32 type, FILE *fp) { - struct perf_event_attr *attr = &evsel->attr; + struct perf_event_attr *attr = &evsel->core.attr;unsigned long secs;unsigned long long nsecs;int printed =0 ;@@ -1168,7 +1168,7 @@ static const char *resolve_branch_sym(struct perf_sample *sample, u64 *ip) {struct addr_location addr_al; -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;const char *name =NULL ;if (sample->flags & (PERF_IP_FLAG_CALL |PERF_IP_FLAG_TRACE_BEGIN )) {@@ -1195,7 +1195,7 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample,struct thread *thread, struct addr_location *al, FILE *fp) { - struct perf_event_attr *attr = &evsel->attr; + struct perf_event_attr *attr = &evsel->core.attr;size_t depth =thread_stack__depth (thread, sample->cpu);const char *name =NULL ;static int spacing;@@ -1290,7 +1290,7 @@ static int perf_sample__fprintf_bts(struct perf_sample *sample,struct addr_location *al, struct machine *machine, FILE *fp) { - struct perf_event_attr *attr = &evsel->attr; + struct perf_event_attr *attr = &evsel->core.attr;unsigned int type =output_type (attr->type);bool print_srcline_last = false;int printed =0 ;@@ -1322,7 +1322,7 @@ static int perf_sample__fprintf_bts(struct perf_sample *sample,/* print branch_to information */ if (PRINT_FIELD (ADDR ) || - ((evsel->attr.sample_type &PERF_SAMPLE_ADDR ) && + ((evsel->core.attr.sample_type &PERF_SAMPLE_ADDR ) && !output[type].user_set)) { printed +=fprintf (fp," => " ); printed +=perf_sample__fprintf_addr (sample, thread, attr, fp);@@ -1595,7 +1595,7 @@ static int perf_sample__fprintf_synth_cbr(struct perf_sample *sample, FILE *fp)static int perf_sample__fprintf_synth (struct perf_sample *sample,struct evsel *evsel,FILE *fp) { -switch (evsel->attr.config) { +switch (evsel->core.attr.config) {case PERF_SYNTH_INTEL_PTWRITE :return perf_sample__fprintf_synth_ptwrite (sample, fp);case PERF_SYNTH_INTEL_MWAIT :@@ -1793,7 +1793,7 @@ static void process_event(struct perf_script *script, struct machine *machine) {struct thread *thread = al->thread; -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;unsigned int type =output_type (attr->type);struct evsel_script *es = evsel->priv;FILE *fp = es->fp;@@ -2046,18 +2046,18 @@ static int process_attr(struct perf_tool *tool, union perf_event *event, } } -if (evsel->attr.type >=PERF_TYPE_MAX && - evsel->attr.type !=PERF_TYPE_SYNTH ) +if (evsel->core.attr.type >=PERF_TYPE_MAX && + evsel->core.attr.type !=PERF_TYPE_SYNTH )return 0 ;evlist__for_each_entry (evlist, pos) { -if (pos->attr.type == evsel->attr.type && pos != evsel) +if (pos->core.attr.type == evsel->core.attr.type && pos != evsel)return 0 ; } -set_print_ip_opts (&evsel->attr); +set_print_ip_opts (&evsel->core.attr); -if (evsel->attr.sample_type) +if (evsel->core.attr.sample_type) err =perf_evsel__check_attr (evsel, scr->session);return err;@@ -2083,7 +2083,7 @@ static int process_comm_event(struct perf_tool *tool,if (perf_event__process_comm (tool, event, sample, machine) <0 ) goto out; -if (!evsel->attr.sample_id_all) { +if (!evsel->core.attr.sample_id_all) { sample->cpu =0 ; sample->time =0 ; sample->tid = event->comm.tid;@@ -2121,7 +2121,7 @@ static int process_namespaces_event(struct perf_tool *tool,if (perf_event__process_namespaces (tool, event, sample, machine) <0 ) goto out; -if (!evsel->attr.sample_id_all) { +if (!evsel->core.attr.sample_id_all) { sample->cpu =0 ; sample->time =0 ; sample->tid = event->namespaces.tid;@@ -2157,7 +2157,7 @@ static int process_fork_event(struct perf_tool *tool,return -1 ; } -if (!evsel->attr.sample_id_all) { +if (!evsel->core.attr.sample_id_all) { sample->cpu =0 ; sample->time = event->fork.time; sample->tid = event->fork.tid;@@ -2189,7 +2189,7 @@ static int process_exit_event(struct perf_tool *tool,return -1 ; } -if (!evsel->attr.sample_id_all) { +if (!evsel->core.attr.sample_id_all) { sample->cpu =0 ; sample->time =0 ; sample->tid = event->fork.tid;@@ -2227,7 +2227,7 @@ static int process_mmap_event(struct perf_tool *tool,return -1 ; } -if (!evsel->attr.sample_id_all) { +if (!evsel->core.attr.sample_id_all) { sample->cpu =0 ; sample->time =0 ; sample->tid = event->mmap.tid;@@ -2261,7 +2261,7 @@ static int process_mmap2_event(struct perf_tool *tool,return -1 ; } -if (!evsel->attr.sample_id_all) { +if (!evsel->core.attr.sample_id_all) { sample->cpu =0 ; sample->time =0 ; sample->tid = event->mmap2.tid;@@ -2360,7 +2360,7 @@ process_bpf_events(struct perf_tool *tool __maybe_unused,if (machine__process_ksymbol (machine, event, sample) <0 )return -1 ; -if (!evsel->attr.sample_id_all) { +if (!evsel->core.attr.sample_id_all) {perf_event__fprintf (event, stdout);return 0 ; }tools/perf/builtin-stat.c +1
-1@@ -391,7 +391,7 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *infstatic bool perf_evsel__should_store_id (struct evsel *counter) { -return STAT_RECORD || counter->attr.read_format &PERF_FORMAT_ID ; +return STAT_RECORD || counter->core.attr.read_format &PERF_FORMAT_ID ; } static bool is_target_alive(struct target *_target,tools/perf/builtin-timechart.c +1
-1@@ -557,7 +557,7 @@ static int process_sample_event(struct perf_tool *tool, { struct timechart *tchart = container_of(tool, struct timechart, tool); -if (evsel->attr.sample_type &PERF_SAMPLE_TIME ) { +if (evsel->core.attr.sample_type &PERF_SAMPLE_TIME ) {if (!tchart->first_time || tchart->first_time > sample->time) tchart->first_time = sample->time;if (tchart->last_time < sample->time)tools/perf/builtin-top.c +1
-1@@ -966,7 +966,7 @@ static int perf_top_overwrite_fallback(struct perf_top *top,return 0 ;evlist__for_each_entry (evlist, counter) - counter->attr.write_backward = false; + counter->core.attr.write_backward = false; opts->overwrite = false;pr_debug2 ("fall back to non-overwrite mode\n" );return 1 ;tools/perf/builtin-trace.c +16
-16@@ -2058,8 +2058,8 @@ static int trace__resolve_callchain(struct trace *trace, struct evsel *evsel, struct callchain_cursor *cursor) {struct addr_location al; -int max_stack = evsel->attr.sample_max_stack ? - evsel->attr.sample_max_stack : +int max_stack = evsel->core.attr.sample_max_stack ? + evsel->core.attr.sample_max_stack : trace->max_stack;int err;@@ -2474,7 +2474,7 @@ static int trace__pgfault(struct trace *trace,if (ttrace ==NULL ) goto out_put; -if (evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ) +if (evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ) ttrace->pfmaj++;else ttrace->pfmin++;@@ -2487,7 +2487,7 @@ static int trace__pgfault(struct trace *trace,trace__fprintf_entry_head (trace, thread,0 , true, sample->time, trace->output);fprintf (trace->output,"%sfault [" , - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ? + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ?"maj" :"min" );print_location (trace->output, sample, &al, false, true);@@ -2535,7 +2535,7 @@ static void trace__set_base_time(struct trace *trace,* appears in our event stream (vfs_getname comes to mind). */ if (trace->base_time ==0 && !trace->full_time && - (evsel->attr.sample_type &PERF_SAMPLE_TIME )) + (evsel->core.attr.sample_type &PERF_SAMPLE_TIME )) trace->base_time = sample->time; }@@ -2694,7 +2694,7 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, sttrace__set_base_time (trace, evsel, sample); -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT && +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT && sample->raw_data ==NULL ) { fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n", perf_evsel__name(evsel), sample->tid,@@ -2740,7 +2740,7 @@ static int trace__add_syscall_newtp(struct trace *trace)* leading to the syscall, allow overriding that for * debugging reasons using --kernel_syscall_callchains */ - sys_exit->attr.exclude_callchain_kernel =1 ; + sys_exit->core.attr.exclude_callchain_kernel =1 ; } trace->syscalls.events.sys_enter = sys_enter;@@ -3413,18 +3413,18 @@ static int trace__run(struct trace *trace, int argc, const char **argv) trace->multiple_threads =thread_map__pid (evlist->threads,0 ) ==-1 || evlist->threads->nr >1 || -perf_evlist__first (evlist)->attr.inherit; +perf_evlist__first (evlist)->core.attr.inherit;/* -* Now that we already used evsel->attr to ask the kernel to setup the -* events, lets reuse evsel->attr.sample_max_stack as the limit in +* Now that we already used evsel->core.attr to ask the kernel to setup the +* events, lets reuse evsel->core.attr.sample_max_stack as the limit in * trace__resolve_callchain(), allowing per-event max-stack settings * to override an explicitly set --max-stack global setting. */ evlist__for_each_entry (evlist, evsel) {if (evsel__has_callchain (evsel) && - evsel->attr.sample_max_stack ==0 ) - evsel->attr.sample_max_stack = trace->max_stack; + evsel->core.attr.sample_max_stack ==0 ) + evsel->core.attr.sample_max_stack = trace->max_stack; } again: before = trace->nr_events;@@ -3617,10 +3617,10 @@ static int trace__replay(struct trace *trace) }evlist__for_each_entry (session->evlist, evsel) { -if (evsel->attr.type ==PERF_TYPE_SOFTWARE && - (evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ || - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MIN || - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS )) +if (evsel->core.attr.type ==PERF_TYPE_SOFTWARE && + (evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ || + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MIN || + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS )) evsel->handler = trace__pgfault; }tools/perf/lib/evsel.c +2
-1@@ -3,7 +3,8 @@#include <linux/list.h> #include <internal/evsel.h> -void perf_evsel__init (struct perf_evsel *evsel) +void perf_evsel__init (struct perf_evsel *evsel,struct perf_event_attr *attr) {INIT_LIST_HEAD (&evsel->node); + evsel->attr = *attr; }tools/perf/lib/include/internal/evsel.h +4
-0@@ -2,8 +2,12 @@#ifndef __LIBPERF_INTERNAL_EVSEL_H#define __LIBPERF_INTERNAL_EVSEL_H +#include <linux/types.h> +#include <linux/perf_event.h> +struct perf_evsel {struct list_head node; +struct perf_event_attr attr; };#endif /* __LIBPERF_INTERNAL_EVSEL_H */ tools/perf/lib/include/perf/evsel.h +3
-1@@ -2,10 +2,12 @@#ifndef __LIBPERF_EVSEL_H#define __LIBPERF_EVSEL_H +#include <linux/perf_event.h> #include <perf/core.h> struct perf_evsel ; -LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel); +LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel, +struct perf_event_attr *attr);#endif /* __LIBPERF_EVSEL_H */ tools/perf/tests/code-reading.c +3
-3@@ -642,9 +642,9 @@ static int do_test_code_reading(bool try_kcore) evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ; ret =evlist__open (evlist);if (ret <0 ) {tools/perf/tests/event-times.c +4
-4@@ -36,7 +36,7 @@ static int attach__enable_on_exec(struct evlist *evlist)return err; } - evsel->attr.enable_on_exec =1 ; + evsel->core.attr.enable_on_exec =1 ; err =evlist__open (evlist);if (err <0 ) {@@ -68,7 +68,7 @@ static int attach__current_disabled(struct evlist *evlist)return -1 ; } - evsel->attr.disabled =1 ; + evsel->core.attr.disabled =1 ; err =perf_evsel__open_per_thread (evsel, threads);if (err) {@@ -121,7 +121,7 @@ static int attach__cpu_disabled(struct evlist *evlist)return -1 ; } - evsel->attr.disabled =1 ; + evsel->core.attr.disabled =1 ; err =perf_evsel__open_per_cpu (evsel, cpus);if (err) {@@ -179,7 +179,7 @@ static int test_times(int (attach)(struct evlist *), } evsel =perf_evlist__last (evlist); - evsel->attr.read_format |= + evsel->core.attr.read_format |=PERF_FORMAT_TOTAL_TIME_ENABLED |PERF_FORMAT_TOTAL_TIME_RUNNING ;tools/perf/tests/keep-tracking.c +3
-3@@ -90,9 +90,9 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ;if (evlist__open (evlist) <0 ) {pr_debug ("Unable to open dummy and cycles event\n" );tools/perf/tests/mmap-basic.c +1
-1@@ -79,7 +79,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse goto out_delete_evlist; } - evsels[i]->attr.wakeup_events =1 ; + evsels[i]->core.attr.wakeup_events =1 ;perf_evsel__set_sample_id (evsels[i], false);evlist__add (evlist, evsels[i]);tools/perf/tests/parse-events.c +436
-436@@ -50,10 +50,10 @@ static int test__checkevent_tracepoint(struct evlist *evlist)TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries);TEST_ASSERT_VAL ("wrong number of groups" ,0 == evlist->nr_groups); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong sample_type" , -PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type); -TEST_ASSERT_VAL ("wrong sample_period" ,1 == evsel->attr.sample_period); +PERF_TP_SAMPLE_TYPE == evsel->core.attr.sample_type); +TEST_ASSERT_VAL ("wrong sample_period" ,1 == evsel->core.attr.sample_period);return 0 ; }@@ -66,11 +66,11 @@ static int test__checkevent_tracepoint_multi(struct evlist *evlist)evlist__for_each_entry (evlist, evsel) {TEST_ASSERT_VAL ("wrong type" , -PERF_TYPE_TRACEPOINT == evsel->attr.type); +PERF_TYPE_TRACEPOINT == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong sample_type" , -PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type); +PERF_TP_SAMPLE_TYPE == evsel->core.attr.sample_type);TEST_ASSERT_VAL ("wrong sample_period" , -1 == evsel->attr.sample_period); +1 == evsel->core.attr.sample_period); }return 0 ; }@@ -80,8 +80,8 @@ static int test__checkevent_raw(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0x1a == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0x1a == evsel->core.attr.config);return 0 ; }@@ -90,8 +90,8 @@ static int test__checkevent_numeric(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,1 == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,1 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,1 == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,1 == evsel->core.attr.config);return 0 ; }@@ -100,9 +100,9 @@ static int test__checkevent_symbolic_name(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config); +PERF_COUNT_HW_INSTRUCTIONS == evsel->core.attr.config);return 0 ; }@@ -111,19 +111,19 @@ static int test__checkevent_symbolic_name_config(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config);/* * The period value gets configured within perf_evlist__config, * while this test executes only parse events method. */ TEST_ASSERT_VAL ("wrong period" , -0 == evsel->attr.sample_period); +0 == evsel->core.attr.sample_period);TEST_ASSERT_VAL ("wrong config1" , -0 == evsel->attr.config1); +0 == evsel->core.attr.config1);TEST_ASSERT_VAL ("wrong config2" , -1 == evsel->attr.config2); +1 == evsel->core.attr.config2);return 0 ; }@@ -132,9 +132,9 @@ static int test__checkevent_symbolic_alias(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_SW_PAGE_FAULTS == evsel->attr.config); +PERF_COUNT_SW_PAGE_FAULTS == evsel->core.attr.config);return 0 ; }@@ -143,8 +143,8 @@ static int test__checkevent_genhw(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HW_CACHE == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" , (1 <<16 ) == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HW_CACHE == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" , (1 <<16 ) == evsel->core.attr.config);return 0 ; }@@ -153,12 +153,12 @@ static int test__checkevent_breakpoint(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong bp_type" , (HW_BREAKPOINT_R |HW_BREAKPOINT_W ) == - evsel->attr.bp_type); + evsel->core.attr.bp_type);TEST_ASSERT_VAL ("wrong bp_len" ,HW_BREAKPOINT_LEN_4 == - evsel->attr.bp_len); + evsel->core.attr.bp_len);return 0 ; }@@ -167,11 +167,11 @@ static int test__checkevent_breakpoint_x(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong bp_type" , -HW_BREAKPOINT_X == evsel->attr.bp_type); -TEST_ASSERT_VAL ("wrong bp_len" ,sizeof (long ) == evsel->attr.bp_len); +HW_BREAKPOINT_X == evsel->core.attr.bp_type); +TEST_ASSERT_VAL ("wrong bp_len" ,sizeof (long ) == evsel->core.attr.bp_len);return 0 ; }@@ -181,12 +181,12 @@ static int test__checkevent_breakpoint_r(struct evlist *evlist)TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries);TEST_ASSERT_VAL ("wrong type" , -PERF_TYPE_BREAKPOINT == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0 == evsel->attr.config); +PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong bp_type" , -HW_BREAKPOINT_R == evsel->attr.bp_type); +HW_BREAKPOINT_R == evsel->core.attr.bp_type);TEST_ASSERT_VAL ("wrong bp_len" , -HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len); +HW_BREAKPOINT_LEN_4 == evsel->core.attr.bp_len);return 0 ; }@@ -196,12 +196,12 @@ static int test__checkevent_breakpoint_w(struct evlist *evlist)TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries);TEST_ASSERT_VAL ("wrong type" , -PERF_TYPE_BREAKPOINT == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0 == evsel->attr.config); +PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong bp_type" , -HW_BREAKPOINT_W == evsel->attr.bp_type); +HW_BREAKPOINT_W == evsel->core.attr.bp_type);TEST_ASSERT_VAL ("wrong bp_len" , -HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len); +HW_BREAKPOINT_LEN_4 == evsel->core.attr.bp_len);return 0 ; }@@ -211,12 +211,12 @@ static int test__checkevent_breakpoint_rw(struct evlist *evlist)TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries);TEST_ASSERT_VAL ("wrong type" , -PERF_TYPE_BREAKPOINT == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0 == evsel->attr.config); +PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong bp_type" , - (HW_BREAKPOINT_R |HW_BREAKPOINT_W ) == evsel->attr.bp_type); + (HW_BREAKPOINT_R |HW_BREAKPOINT_W ) == evsel->core.attr.bp_type);TEST_ASSERT_VAL ("wrong bp_len" , -HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len); +HW_BREAKPOINT_LEN_4 == evsel->core.attr.bp_len);return 0 ; }@@ -224,10 +224,10 @@ static int test__checkevent_tracepoint_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);return test__checkevent_tracepoint (evlist); }@@ -241,11 +241,11 @@ test__checkevent_tracepoint_multi_modifier(struct evlist *evlist)evlist__for_each_entry (evlist, evsel) {TEST_ASSERT_VAL ("wrong exclude_user" , - !evsel->attr.exclude_user); + !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , - evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); + evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); }return test__checkevent_tracepoint_multi (evlist);@@ -255,10 +255,10 @@ static int test__checkevent_raw_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip);return test__checkevent_raw (evlist); }@@ -267,10 +267,10 @@ static int test__checkevent_numeric_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip);return test__checkevent_numeric (evlist); }@@ -279,10 +279,10 @@ static int test__checkevent_symbolic_name_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);return test__checkevent_symbolic_name (evlist); }@@ -291,8 +291,8 @@ static int test__checkevent_exclude_host_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);return test__checkevent_symbolic_name (evlist); }@@ -301,8 +301,8 @@ static int test__checkevent_exclude_guest_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);return test__checkevent_symbolic_name (evlist); }@@ -311,10 +311,10 @@ static int test__checkevent_symbolic_alias_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);return test__checkevent_symbolic_alias (evlist); }@@ -323,10 +323,10 @@ static int test__checkevent_genhw_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip);return test__checkevent_genhw (evlist); }@@ -335,13 +335,13 @@ static int test__checkevent_exclude_idle_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude idle" , evsel->attr.exclude_idle); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude idle" , evsel->core.attr.exclude_idle); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);return test__checkevent_symbolic_name (evlist); }@@ -350,13 +350,13 @@ static int test__checkevent_exclude_idle_modifier_1(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude idle" , evsel->attr.exclude_idle); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude idle" , evsel->core.attr.exclude_idle); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);return test__checkevent_symbolic_name (evlist); }@@ -366,10 +366,10 @@ static int test__checkevent_breakpoint_modifier(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong name" , !strcmp (perf_evsel__name (evsel),"mem:0:u" ));@@ -380,10 +380,10 @@ static int test__checkevent_breakpoint_x_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong name" , !strcmp (perf_evsel__name (evsel),"mem:0:x:k" ));@@ -394,10 +394,10 @@ static int test__checkevent_breakpoint_r_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong name" , !strcmp (perf_evsel__name (evsel),"mem:0:r:hp" ));@@ -408,10 +408,10 @@ static int test__checkevent_breakpoint_w_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong name" , !strcmp (perf_evsel__name (evsel),"mem:0:w:up" ));@@ -422,10 +422,10 @@ static int test__checkevent_breakpoint_rw_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong name" , !strcmp (perf_evsel__name (evsel),"mem:0:rw:kp" ));@@ -438,15 +438,15 @@ static int test__checkevent_pmu(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,10 == evsel->attr.config); -TEST_ASSERT_VAL ("wrong config1" ,1 == evsel->attr.config1); -TEST_ASSERT_VAL ("wrong config2" ,3 == evsel->attr.config2); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,10 == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong config1" ,1 == evsel->core.attr.config1); +TEST_ASSERT_VAL ("wrong config2" ,3 == evsel->core.attr.config2);/* * The period value gets configured within perf_evlist__config, * while this test executes only parse events method. */ -TEST_ASSERT_VAL ("wrong period" ,0 == evsel->attr.sample_period); +TEST_ASSERT_VAL ("wrong period" ,0 == evsel->core.attr.sample_period);return 0 ; }@@ -458,34 +458,34 @@ static int test__checkevent_list(struct evlist *evlist)TEST_ASSERT_VAL ("wrong number of entries" ,3 == evlist->core.nr_entries);/* r1 */ -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,1 == evsel->attr.config); -TEST_ASSERT_VAL ("wrong config1" ,0 == evsel->attr.config1); -TEST_ASSERT_VAL ("wrong config2" ,0 == evsel->attr.config2); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,1 == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong config1" ,0 == evsel->core.attr.config1); +TEST_ASSERT_VAL ("wrong config2" ,0 == evsel->core.attr.config2); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);/* syscalls:sys_enter_openat:k */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong sample_type" , -PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type); -TEST_ASSERT_VAL ("wrong sample_period" ,1 == evsel->attr.sample_period); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_TP_SAMPLE_TYPE == evsel->core.attr.sample_type); +TEST_ASSERT_VAL ("wrong sample_period" ,1 == evsel->core.attr.sample_period); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);/* 1:1:hp */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,1 == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,1 == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong type" ,1 == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,1 == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip);return 0 ; }@@ -496,15 +496,15 @@ static int test__checkevent_pmu_name(struct evlist *evlist)/* cpu/config=1,name=krava/u */ TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,1 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,1 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong name" , !strcmp (perf_evsel__name (evsel),"krava" ));/* cpu/config=2/u" */ evsel =perf_evsel__next (evsel);TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,2 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,2 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong name" , !strcmp (perf_evsel__name (evsel),"cpu/config=2/u" ));@@ -517,29 +517,29 @@ static int test__checkevent_pmu_partial_time_callgraph(struct evlist *evlist)/* cpu/config=1,call-graph=fp,time,period=100000/ */ TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,1 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,1 == evsel->core.attr.config);/* * The period, time and callgraph value gets configured * within perf_evlist__config, * while this test executes only parse events method. */ -TEST_ASSERT_VAL ("wrong period" ,0 == evsel->attr.sample_period); +TEST_ASSERT_VAL ("wrong period" ,0 == evsel->core.attr.sample_period);TEST_ASSERT_VAL ("wrong callgraph" , !evsel__has_callchain (evsel)); -TEST_ASSERT_VAL ("wrong time" , !(PERF_SAMPLE_TIME & evsel->attr.sample_type)); +TEST_ASSERT_VAL ("wrong time" , !(PERF_SAMPLE_TIME & evsel->core.attr.sample_type));/* cpu/config=2,call-graph=no,time=0,period=2000/ */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,2 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,2 == evsel->core.attr.config);/* * The period, time and callgraph value gets configured * within perf_evlist__config, * while this test executes only parse events method. */ -TEST_ASSERT_VAL ("wrong period" ,0 == evsel->attr.sample_period); +TEST_ASSERT_VAL ("wrong period" ,0 == evsel->core.attr.sample_period);TEST_ASSERT_VAL ("wrong callgraph" , !evsel__has_callchain (evsel)); -TEST_ASSERT_VAL ("wrong time" , !(PERF_SAMPLE_TIME & evsel->attr.sample_type)); +TEST_ASSERT_VAL ("wrong time" , !(PERF_SAMPLE_TIME & evsel->core.attr.sample_type));return 0 ; }@@ -549,14 +549,14 @@ static int test__checkevent_pmu_events(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong exclude_user" , - !evsel->attr.exclude_user); + !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , - evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); -TEST_ASSERT_VAL ("wrong pinned" , !evsel->attr.pinned); + evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong pinned" , !evsel->core.attr.pinned);return 0 ; }@@ -569,24 +569,24 @@ static int test__checkevent_pmu_events_mix(struct evlist *evlist)/* pmu-event:u */ TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries);TEST_ASSERT_VAL ("wrong exclude_user" , - !evsel->attr.exclude_user); + !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , - evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); -TEST_ASSERT_VAL ("wrong pinned" , !evsel->attr.pinned); + evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong pinned" , !evsel->core.attr.pinned);/* cpu/pmu-event/u*/ evsel =perf_evsel__next (evsel);TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong exclude_user" , - !evsel->attr.exclude_user); + !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , - evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); -TEST_ASSERT_VAL ("wrong pinned" , !evsel->attr.pinned); + evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong pinned" , !evsel->core.attr.pinned);return 0 ; }@@ -643,15 +643,15 @@ static int test__group1(struct evlist *evlist)/* instructions:k */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_INSTRUCTIONS == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );@@ -659,16 +659,16 @@ static int test__group1(struct evlist *evlist)/* cycles:upp */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv);/* use of precise requires exclude_guest */ -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==2 ); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read);@@ -685,15 +685,15 @@ static int test__group2(struct evlist *evlist)/* faults + :ku modifier */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_SW_PAGE_FAULTS == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_SW_PAGE_FAULTS == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==0 );@@ -701,30 +701,30 @@ static int test__group2(struct evlist *evlist)/* cache-references + :u modifier */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CACHE_REFERENCES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CACHE_REFERENCES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read);/* cycles:k */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read);@@ -740,16 +740,16 @@ static int test__group3(struct evlist *evlist __maybe_unused)/* group1 syscalls:sys_enter_openat:H */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong sample_type" , -PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type); -TEST_ASSERT_VAL ("wrong sample_period" ,1 == evsel->attr.sample_period); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_TP_SAMPLE_TYPE == evsel->core.attr.sample_type); +TEST_ASSERT_VAL ("wrong sample_period" ,1 == evsel->core.attr.sample_period); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , !strcmp (leader->group_name,"group1" ));@@ -759,16 +759,16 @@ static int test__group3(struct evlist *evlist __maybe_unused)/* group1 cycles:kppp */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv);/* use of precise requires exclude_guest */ -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==3 ); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==3 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );@@ -776,15 +776,15 @@ static int test__group3(struct evlist *evlist __maybe_unused)/* group2 cycles + G modifier */ evsel = leader =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , !strcmp (leader->group_name,"group2" ));@@ -794,29 +794,29 @@ static int test__group3(struct evlist *evlist __maybe_unused)/* group2 1:3 + G modifier */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,1 == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,3 == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong type" ,1 == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,3 == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read);/* instructions:u */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_INSTRUCTIONS == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read);@@ -832,16 +832,16 @@ static int test__group4(struct evlist *evlist __maybe_unused)/* cycles:u + p */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv);/* use of precise requires exclude_guest */ -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==1 ); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==1 );TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );@@ -850,16 +850,16 @@ static int test__group4(struct evlist *evlist __maybe_unused)/* instructions:kp + p */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); +PERF_COUNT_HW_INSTRUCTIONS == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv);/* use of precise requires exclude_guest */ -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip ==2 ); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read);@@ -876,15 +876,15 @@ static int test__group5(struct evlist *evlist __maybe_unused)/* cycles + G */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );@@ -893,30 +893,30 @@ static int test__group5(struct evlist *evlist __maybe_unused)/* instructions + G */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_INSTRUCTIONS == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read);/* cycles:G */ evsel = leader =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );@@ -925,29 +925,29 @@ static int test__group5(struct evlist *evlist __maybe_unused)/* instructions:G */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_INSTRUCTIONS == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );/* cycles */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));return 0 ;@@ -962,15 +962,15 @@ static int test__group_gh1(struct evlist *evlist)/* cycles + :H group modifier */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );@@ -978,15 +978,15 @@ static int test__group_gh1(struct evlist *evlist)/* cache-misses:G + :H group modifier */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CACHE_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CACHE_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );@@ -1002,15 +1002,15 @@ static int test__group_gh2(struct evlist *evlist)/* cycles + :G group modifier */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );@@ -1018,15 +1018,15 @@ static int test__group_gh2(struct evlist *evlist)/* cache-misses:H + :G group modifier */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CACHE_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CACHE_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );@@ -1042,15 +1042,15 @@ static int test__group_gh3(struct evlist *evlist)/* cycles:G + :u group modifier */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );@@ -1058,15 +1058,15 @@ static int test__group_gh3(struct evlist *evlist)/* cache-misses:H + :u group modifier */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CACHE_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CACHE_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );@@ -1082,15 +1082,15 @@ static int test__group_gh4(struct evlist *evlist)/* cycles:G + :uG group modifier */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,perf_evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong nr_members" , evsel->nr_members ==2 );@@ -1098,15 +1098,15 @@ static int test__group_gh4(struct evlist *evlist)/* cache-misses:H + :uG group modifier */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CACHE_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CACHE_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong group_idx" ,perf_evsel__group_idx (evsel) ==1 );@@ -1121,44 +1121,44 @@ static int test__leader_sample1(struct evlist *evlist)/* cycles - sampling group leader */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read);/* cache-misses - not sampling */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CACHE_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_CACHE_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read);/* branch-misses - not sampling */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_BRANCH_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_BRANCH_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read);@@ -1174,30 +1174,30 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)/* instructions - sampling group leader */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_INSTRUCTIONS == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read);/* branch-misses - not sampling */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_BRANCH_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong exclude guest" , evsel->attr.exclude_guest); -TEST_ASSERT_VAL ("wrong exclude host" , !evsel->attr.exclude_host); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +PERF_COUNT_HW_BRANCH_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest); +TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader);TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read);@@ -1209,11 +1209,11 @@ static int test__checkevent_pinned_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , evsel->attr.precise_ip); -TEST_ASSERT_VAL ("wrong pinned" , evsel->attr.pinned); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong pinned" , evsel->core.attr.pinned);return test__checkevent_symbolic_name (evlist); }@@ -1226,25 +1226,25 @@ static int test__pinned_group(struct evlist *evlist)/* cycles - group leader */ evsel = leader =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config); +PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" , evsel->leader == leader); -TEST_ASSERT_VAL ("wrong pinned" , evsel->attr.pinned); +TEST_ASSERT_VAL ("wrong pinned" , evsel->core.attr.pinned);/* cache-misses - can not be pinned, but will go on with the leader */ evsel =perf_evsel__next (evsel); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_CACHE_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong pinned" , !evsel->attr.pinned); +PERF_COUNT_HW_CACHE_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong pinned" , !evsel->core.attr.pinned);/* branch-misses - ditto */ evsel =perf_evsel__next (evsel);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_HW_BRANCH_MISSES == evsel->attr.config); -TEST_ASSERT_VAL ("wrong pinned" , !evsel->attr.pinned); +PERF_COUNT_HW_BRANCH_MISSES == evsel->core.attr.config); +TEST_ASSERT_VAL ("wrong pinned" , !evsel->core.attr.pinned);return 0 ; }@@ -1254,12 +1254,12 @@ static int test__checkevent_breakpoint_len(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong bp_type" , (HW_BREAKPOINT_R |HW_BREAKPOINT_W ) == - evsel->attr.bp_type); + evsel->core.attr.bp_type);TEST_ASSERT_VAL ("wrong bp_len" ,HW_BREAKPOINT_LEN_1 == - evsel->attr.bp_len); + evsel->core.attr.bp_len);return 0 ; }@@ -1269,12 +1269,12 @@ static int test__checkevent_breakpoint_len_w(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->attr.type); -TEST_ASSERT_VAL ("wrong config" ,0 == evsel->attr.config); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" ,0 == evsel->core.attr.config);TEST_ASSERT_VAL ("wrong bp_type" ,HW_BREAKPOINT_W == - evsel->attr.bp_type); + evsel->core.attr.bp_type);TEST_ASSERT_VAL ("wrong bp_len" ,HW_BREAKPOINT_LEN_2 == - evsel->attr.bp_len); + evsel->core.attr.bp_len);return 0 ; }@@ -1284,10 +1284,10 @@ test__checkevent_breakpoint_len_rw_modifier(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->attr.exclude_user); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); -TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->attr.exclude_hv); -TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->attr.precise_ip); +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);return test__checkevent_breakpoint_rw (evlist); }@@ -1297,9 +1297,9 @@ static int test__checkevent_precise_max_modifier(struct evlist *evlist)struct evsel *evsel =perf_evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->attr.type); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_SOFTWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" , -PERF_COUNT_SW_TASK_CLOCK == evsel->attr.config); +PERF_COUNT_SW_TASK_CLOCK == evsel->core.attr.config);return 0 ; }@@ -1360,9 +1360,9 @@ static int test__sym_event_slash(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" , evsel->attr.type ==PERF_TYPE_HARDWARE ); -TEST_ASSERT_VAL ("wrong config" , evsel->attr.config ==PERF_COUNT_HW_CPU_CYCLES ); -TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong type" , evsel->core.attr.type ==PERF_TYPE_HARDWARE ); +TEST_ASSERT_VAL ("wrong config" , evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);return 0 ; }@@ -1370,9 +1370,9 @@ static int test__sym_event_dc(struct evlist *evlist) {struct evsel *evsel =perf_evlist__first (evlist); -TEST_ASSERT_VAL ("wrong type" , evsel->attr.type ==PERF_TYPE_HARDWARE ); -TEST_ASSERT_VAL ("wrong config" , evsel->attr.config ==PERF_COUNT_HW_CPU_CYCLES ); -TEST_ASSERT_VAL ("wrong exclude_user" , evsel->attr.exclude_user); +TEST_ASSERT_VAL ("wrong type" , evsel->core.attr.type ==PERF_TYPE_HARDWARE ); +TEST_ASSERT_VAL ("wrong config" , evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ); +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user);return 0 ; }tools/perf/tests/sample-parsing.c +3
-3@@ -155,7 +155,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) {struct evsel evsel = { .needs_swap = false, - .attr = { + .core.attr = { .sample_type = sample_type, .read_format = read_format, },@@ -221,10 +221,10 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)int err, ret =-1 ;if (sample_type &PERF_SAMPLE_REGS_USER ) - evsel.attr.sample_regs_user = sample_regs; + evsel.core.attr.sample_regs_user = sample_regs;if (sample_type &PERF_SAMPLE_REGS_INTR ) - evsel.attr.sample_regs_intr = sample_regs; + evsel.core.attr.sample_regs_intr = sample_regs;for (i =0 ; i <sizeof (regs); i++) *(i + (u8 *)regs) = i &0xfe ;tools/perf/tests/switch-tracking.c +4
-4@@ -420,8 +420,8 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ;perf_evsel__set_sample_bit (tracking_evsel,TIME );@@ -435,7 +435,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ }/* Check tracking event is tracking */ -if (!tracking_evsel->attr.mmap || !tracking_evsel->attr.comm) { +if (!tracking_evsel->core.attr.mmap || !tracking_evsel->core.attr.comm) {pr_debug ("Tracking event not tracking\n" ); goto out_err; }@@ -443,7 +443,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_/* Check non-tracking events are not tracking */ evlist__for_each_entry (evlist, evsel) {if (evsel != tracking_evsel) { -if (evsel->attr.mmap || evsel->attr.comm) { +if (evsel->core.attr.mmap || evsel->core.attr.comm) {pr_debug ("Non-tracking event is tracking\n" ); goto out_err; }tools/perf/tests/task-exit.c +7
-7@@ -84,16 +84,16 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused } evsel =perf_evlist__first (evlist); - evsel->attr.task =1 ; + evsel->core.attr.task =1 ;#ifdef __s390x__ - evsel->attr.sample_freq =1000000 ; + evsel->core.attr.sample_freq =1000000 ;#else - evsel->attr.sample_freq =1 ; + evsel->core.attr.sample_freq =1 ;#endif - evsel->attr.inherit =0 ; - evsel->attr.watermark =0 ; - evsel->attr.wakeup_events =1 ; - evsel->attr.exclude_kernel =1 ; + evsel->core.attr.inherit =0 ; + evsel->core.attr.watermark =0 ; + evsel->core.attr.wakeup_events =1 ; + evsel->core.attr.exclude_kernel =1 ; err =evlist__open (evlist);if (err <0 ) {tools/perf/ui/browsers/res_sample.c +1
-1@@ -66,7 +66,7 @@ int res_sample_browse(struct res_sample *res_samples, int num_res,timestamp__scnprintf_nsec (r->time, tsample,sizeof tsample); -attr_to_script (extra_format, &evsel->attr); +attr_to_script (extra_format, &evsel->core.attr); if (asprintf(&cmd, "%s script %s%s --time %s %s%s %s%s --ns %s %s %s %s %s | less +/%s", perf,tools/perf/ui/browsers/scripts.c +1
-1@@ -100,7 +100,7 @@ static int list_scripts(char *script_name, bool *custom,return -1 ;if (evsel) -attr_to_script (scriptc.extra_format, &evsel->attr); +attr_to_script (scriptc.extra_format, &evsel->core.attr);add_script_option ("Show individual samples" ,"" , &scriptc);add_script_option ("Show individual samples with assembler" ,"-F +insn --xed" , &scriptc);tools/perf/util/auxtrace.c +1
-1@@ -2140,7 +2140,7 @@ static struct perf_pmu *perf_evsel__find_pmu(struct evsel *evsel)struct perf_pmu *pmu =NULL ;while ((pmu =perf_pmu__scan (pmu)) !=NULL ) { -if (pmu->type == evsel->attr.type) +if (pmu->type == evsel->core.attr.type)break ; }tools/perf/util/bpf-loader.c +1
-1@@ -1421,7 +1421,7 @@ apply_config_evsel_for_key(const char *name, int map_fd, void *pkey,return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTDIM ; } - attr = &evsel->attr; + attr = &evsel->core.attr;if (attr->inherit) {pr_debug ("ERROR: Can't put inherit event into map %s\n" , name);return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTINH ;tools/perf/util/data-convert-bt.c +7
-7@@ -587,7 +587,7 @@ static int add_generic_values(struct ctf_writer *cw,struct evsel *evsel, struct perf_sample *sample) { - u64 type = evsel->attr.sample_type; + u64 type = evsel->core.attr.sample_type;int ret;/* @@ -757,7 +757,7 @@ static int get_sample_cpu(struct ctf_writer *cw, struct perf_sample *sample, {int cpu =0 ; -if (evsel->attr.sample_type &PERF_SAMPLE_CPU ) +if (evsel->core.attr.sample_type &PERF_SAMPLE_CPU ) cpu = sample->cpu;if (cpu > cw->stream_cnt) {@@ -795,7 +795,7 @@ static int process_sample_event(struct perf_tool *tool,struct bt_ctf_event_class *event_class;struct bt_ctf_event *event;int ret; -unsigned long type = evsel->attr.sample_type; +unsigned long type = evsel->core.attr.sample_type;if (WARN_ONCE (!priv,"Failed to setup all events.\n" ))return 0 ;@@ -820,7 +820,7 @@ static int process_sample_event(struct perf_tool *tool,if (ret)return -1 ; -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT ) { +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) { ret =add_tracepoint_values (cw, event_class, event, evsel, sample);if (ret)@@ -1087,7 +1087,7 @@ static int add_bpf_output_types(struct ctf_writer *cw,static int add_generic_types (struct ctf_writer *cw,struct evsel *evsel,struct bt_ctf_event_class *event_class) { -u64 type = evsel->attr.sample_type; +u64 type = evsel->core.attr.sample_type;/* * missing: @@ -1157,7 +1157,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)const char *name =perf_evsel__name (evsel);int ret; -pr ("Adding event '%s' (type %d)\n" , name, evsel->attr.type); +pr ("Adding event '%s' (type %d)\n" , name, evsel->core.attr.type); event_class =bt_ctf_event_class_create (name);if (!event_class)@@ -1167,7 +1167,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)if (ret) goto err; -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT ) { +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) { ret =add_tracepoint_types (cw, evsel, event_class);if (ret) goto err;tools/perf/util/db-export.c +2
-2@@ -388,8 +388,8 @@ int db_export__sample(struct db_export *dbe, union perf_event *event, } } -if ((evsel->attr.sample_type &PERF_SAMPLE_ADDR ) && -sample_addr_correlates_sym (&evsel->attr)) { +if ((evsel->core.attr.sample_type &PERF_SAMPLE_ADDR ) && +sample_addr_correlates_sym (&evsel->core.attr)) {struct addr_location addr_al;thread__resolve (thread, &addr_al, sample);tools/perf/util/evlist.c +25
-25@@ -299,8 +299,8 @@ perf_evlist__find_tracepoint_by_id(struct evlist *evlist, int id)struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT && - (int )evsel->attr.config == id) +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT && + (int )evsel->core.attr.config == id)return evsel; }@@ -314,7 +314,7 @@ perf_evlist__find_tracepoint_by_name(struct evlist *evlist,struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if ((evsel->attr.type ==PERF_TYPE_TRACEPOINT ) && +if ((evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) && (strcmp (evsel->name, name) ==0 ))return evsel; }@@ -529,13 +529,13 @@ int perf_evlist__id_add_fd(struct evlist *evlist,if (perf_evlist__read_format (evlist) &PERF_FORMAT_GROUP )return -1 ; -if (!(evsel->attr.read_format &PERF_FORMAT_ID ) || +if (!(evsel->core.attr.read_format &PERF_FORMAT_ID ) ||read (fd, &read_data,sizeof (read_data)) ==-1 )return -1 ; -if (evsel->attr.read_format &PERF_FORMAT_TOTAL_TIME_ENABLED ) +if (evsel->core.attr.read_format &PERF_FORMAT_TOTAL_TIME_ENABLED ) ++id_idx; -if (evsel->attr.read_format &PERF_FORMAT_TOTAL_TIME_RUNNING ) +if (evsel->core.attr.read_format &PERF_FORMAT_TOTAL_TIME_RUNNING ) ++id_idx; id = read_data[id_idx];@@ -642,7 +642,7 @@ struct evsel *perf_evlist__event2evsel(struct evlist *evlist,if (evlist->core.nr_entries ==1 )return first; -if (!first->attr.sample_id_all && +if (!first->core.attr.sample_id_all && event->header.type !=PERF_RECORD_SAMPLE )return first;@@ -747,7 +747,7 @@ static bool perf_evlist__should_poll(struct evlist *evlist __maybe_unused, struct evsel *evsel) { -if (evsel->attr.write_backward) +if (evsel->core.attr.write_backward)return false;return true; }@@ -767,7 +767,7 @@ static int perf_evlist__mmap_per_evsel(struct evlist *evlist, int idx,int cpu; mp->prot =PROT_READ |PROT_WRITE ; -if (evsel->attr.write_backward) { +if (evsel->core.attr.write_backward) { output = _output_overwrite; maps = evlist->overwrite_mmap;@@ -818,7 +818,7 @@ static int perf_evlist__mmap_per_evsel(struct evlist *evlist, int idx,return -1 ; } -if (evsel->attr.read_format &PERF_FORMAT_ID ) { +if (evsel->core.attr.read_format &PERF_FORMAT_ID ) {if (perf_evlist__id_add_fd (evlist, evsel, cpu, thread, fd) <0 )return -1 ;@@ -1039,7 +1039,7 @@ int perf_evlist__mmap_ex(struct evlist *evlist, unsigned int pages, auxtrace_pages, auxtrace_overwrite);evlist__for_each_entry (evlist, evsel) { -if ((evsel->attr.read_format &PERF_FORMAT_ID ) && +if ((evsel->core.attr.read_format &PERF_FORMAT_ID ) && evsel->sample_id ==NULL &&perf_evsel__alloc_id (evsel,cpu_map__nr (cpus), threads->nr) <0 )return -ENOMEM ;@@ -1175,7 +1175,7 @@ int perf_evlist__set_tp_filter(struct evlist *evlist, const char *filter)int err =0 ;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type !=PERF_TYPE_TRACEPOINT ) +if (evsel->core.attr.type !=PERF_TYPE_TRACEPOINT )continue ; err =perf_evsel__set_filter (evsel, filter);@@ -1245,7 +1245,7 @@ u64 __perf_evlist__combined_sample_type(struct evlist *evlist)return evlist->combined_sample_type;evlist__for_each_entry (evlist, evsel) - evlist->combined_sample_type |= evsel->attr.sample_type; + evlist->combined_sample_type |= evsel->core.attr.sample_type;return evlist->combined_sample_type; }@@ -1262,18 +1262,18 @@ u64 perf_evlist__combined_branch_type(struct evlist *evlist)u64 branch_type =0 ;evlist__for_each_entry (evlist, evsel) - branch_type |= evsel->attr.branch_sample_type; + branch_type |= evsel->core.attr.branch_sample_type;return branch_type; }bool perf_evlist__valid_read_format (struct evlist *evlist) {struct evsel *first =perf_evlist__first (evlist), *pos = first; -u64 read_format = first->attr.read_format; -u64 sample_type = first->attr.sample_type; +u64 read_format = first->core.attr.read_format; +u64 sample_type = first->core.attr.sample_type;evlist__for_each_entry (evlist, pos) { -if (read_format != pos->attr.read_format) +if (read_format != pos->core.attr.read_format)return false; }@@ -1289,7 +1289,7 @@ bool perf_evlist__valid_read_format(struct evlist *evlist)u64 perf_evlist__read_format (struct evlist *evlist) {struct evsel *first =perf_evlist__first (evlist); -return first->attr.read_format; +return first->core.attr.read_format; }u16 perf_evlist__id_hdr_size (struct evlist *evlist)@@ -1299,10 +1299,10 @@ u16 perf_evlist__id_hdr_size(struct evlist *evlist)u64 sample_type;u16 size =0 ; -if (!first->attr.sample_id_all) +if (!first->core.attr.sample_id_all) goto out; - sample_type = first->attr.sample_type; + sample_type = first->core.attr.sample_type;if (sample_type &PERF_SAMPLE_TID ) size +=sizeof (data->tid) *2 ;@@ -1330,7 +1330,7 @@ bool perf_evlist__valid_sample_id_all(struct evlist *evlist)struct evsel *first =perf_evlist__first (evlist), *pos = first;evlist__for_each_entry_continue (evlist, pos) { -if (first->attr.sample_id_all != pos->attr.sample_id_all) +if (first->core.attr.sample_id_all != pos->core.attr.sample_id_all)return false; }@@ -1340,7 +1340,7 @@ bool perf_evlist__valid_sample_id_all(struct evlist *evlist)bool perf_evlist__sample_id_all (struct evlist *evlist) {struct evsel *first =perf_evlist__first (evlist); -return first->attr.sample_id_all; +return first->core.attr.sample_id_all; } void perf_evlist__set_selected(struct evlist *evlist,@@ -1620,14 +1620,14 @@ int perf_evlist__strerror_open(struct evlist *evlist,if (sysctl__read_int ("kernel/perf_event_max_sample_rate" , &max_freq) <0 ) goto out_default; -if (first->attr.sample_freq < (u64 )max_freq) +if (first->core.attr.sample_freq < (u64 )max_freq) goto out_default; printed =scnprintf (buf, size,"Error:\t%s.\n" "Hint:\tCheck /proc/sys/kernel/perf_event_max_sample_rate.\n" "Hint:\tThe current value is %d and %" PRIu64" is being requested." , - emsg, max_freq, first->attr.sample_freq); + emsg, max_freq, first->core.attr.sample_freq);break ; }default :@@ -1782,7 +1782,7 @@ bool perf_evlist__exclude_kernel(struct evlist *evlist)struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if (!evsel->attr.exclude_kernel) +if (!evsel->core.attr.exclude_kernel)return false; }tools/perf/util/evsel.c +83
-84@@ -170,15 +170,15 @@ static int __perf_evsel__calc_is_pos(u64 sample_type)void perf_evsel__calc_id_pos (struct evsel *evsel) { - evsel->id_pos =__perf_evsel__calc_id_pos (evsel->attr.sample_type); - evsel->is_pos =__perf_evsel__calc_is_pos (evsel->attr.sample_type); + evsel->id_pos =__perf_evsel__calc_id_pos (evsel->core.attr.sample_type); + evsel->is_pos =__perf_evsel__calc_is_pos (evsel->core.attr.sample_type); }void __perf_evsel__set_sample_bit (struct evsel *evsel,enum perf_event_sample_format bit) { -if (!(evsel->attr.sample_type & bit)) { - evsel->attr.sample_type |= bit; +if (!(evsel->core.attr.sample_type & bit)) { + evsel->core.attr.sample_type |= bit; evsel->sample_size +=sizeof (u64);perf_evsel__calc_id_pos (evsel); }@@ -187,8 +187,8 @@ void __perf_evsel__set_sample_bit(struct evsel *evsel,void __perf_evsel__reset_sample_bit (struct evsel *evsel,enum perf_event_sample_format bit) { -if (evsel->attr.sample_type & bit) { - evsel->attr.sample_type &= ~bit; +if (evsel->core.attr.sample_type & bit) { + evsel->core.attr.sample_type &= ~bit; evsel->sample_size -=sizeof (u64);perf_evsel__calc_id_pos (evsel); }@@ -203,7 +203,7 @@ void perf_evsel__set_sample_id(struct evsel *evsel, }else {perf_evsel__set_sample_bit (evsel,ID ); } - evsel->attr.read_format |=PERF_FORMAT_ID ; + evsel->core.attr.read_format |=PERF_FORMAT_ID ; }/** @@ -227,10 +227,9 @@ bool perf_evsel__is_function_event(struct evsel *evsel)void evsel__init (struct evsel *evsel,struct perf_event_attr *attr,int idx) { -perf_evsel__init (&evsel->core); +perf_evsel__init (&evsel->core, attr); evsel->idx = idx; evsel->tracking = !idx; - evsel->attr = *attr; evsel->leader = evsel; evsel->unit ="" ; evsel->scale =1.0 ;@@ -259,9 +258,9 @@ struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)evsel__init (evsel, attr, idx);if (perf_evsel__is_bpf_output (evsel)) { - evsel->attr.sample_type |= (PERF_SAMPLE_RAW |PERF_SAMPLE_TIME | + evsel->core.attr.sample_type |= (PERF_SAMPLE_RAW |PERF_SAMPLE_TIME |PERF_SAMPLE_CPU |PERF_SAMPLE_PERIOD ), - evsel->attr.sample_period =1 ; + evsel->core.attr.sample_period =1 ; }if (perf_evsel__is_clock (evsel)) {@@ -387,7 +386,7 @@ static const char *__perf_evsel__hw_name(u64 config)static int perf_evsel__add_modifiers (struct evsel *evsel,char *bf,size_t size) {int colon =0 , r =0 ; -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;bool exclude_guest_default = false;#define MOD_PRINT (context, mod) do { \@@ -422,7 +421,7 @@ static int perf_evsel__add_modifiers(struct evsel *evsel, char *bf, size_t size)static int perf_evsel__hw_name (struct evsel *evsel,char *bf,size_t size) { -int r =scnprintf (bf, size,"%s" ,__perf_evsel__hw_name (evsel->attr.config)); +int r =scnprintf (bf, size,"%s" ,__perf_evsel__hw_name (evsel->core.attr.config));return r +perf_evsel__add_modifiers (evsel, bf + r, size - r); }@@ -448,7 +447,7 @@ static const char *__perf_evsel__sw_name(u64 config)static int perf_evsel__sw_name (struct evsel *evsel,char *bf,size_t size) { -int r =scnprintf (bf, size,"%s" ,__perf_evsel__sw_name (evsel->attr.config)); +int r =scnprintf (bf, size,"%s" ,__perf_evsel__sw_name (evsel->core.attr.config));return r +perf_evsel__add_modifiers (evsel, bf + r, size - r); }@@ -472,7 +471,7 @@ static int __perf_evsel__bp_name(char *bf, size_t size, u64 addr, u64 type)static int perf_evsel__bp_name (struct evsel *evsel,char *bf,size_t size) { -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;int r =__perf_evsel__bp_name (bf, size, attr->bp_addr, attr->bp_type);return r +perf_evsel__add_modifiers (evsel, bf + r, size - r); }@@ -572,13 +571,13 @@ static int __perf_evsel__hw_cache_name(u64 config, char *bf, size_t size)static int perf_evsel__hw_cache_name (struct evsel *evsel,char *bf,size_t size) { -int ret =__perf_evsel__hw_cache_name (evsel->attr.config, bf, size); +int ret =__perf_evsel__hw_cache_name (evsel->core.attr.config, bf, size);return ret +perf_evsel__add_modifiers (evsel, bf + ret, size - ret); }static int perf_evsel__raw_name (struct evsel *evsel,char *bf,size_t size) { -int ret =scnprintf (bf, size,"raw 0x%" PRIx64, evsel->attr.config); +int ret =scnprintf (bf, size,"raw 0x%" PRIx64, evsel->core.attr.config);return ret +perf_evsel__add_modifiers (evsel, bf + ret, size - ret); }@@ -598,7 +597,7 @@ const char *perf_evsel__name(struct evsel *evsel)if (evsel->name)return evsel->name; -switch (evsel->attr.type) { +switch (evsel->core.attr.type) {case PERF_TYPE_RAW :perf_evsel__raw_name (evsel, bf,sizeof (bf));break ;@@ -628,7 +627,7 @@ const char *perf_evsel__name(struct evsel *evsel)default :scnprintf (bf,sizeof (bf),"unknown attr type: %d" , - evsel->attr.type); + evsel->core.attr.type);break ; }@@ -682,7 +681,7 @@ static void __perf_evsel__config_callchain(struct evsel *evsel, struct callchain_param *param) {bool function =perf_evsel__is_function_event (evsel); -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;perf_evsel__set_sample_bit (evsel,CALLCHAIN );@@ -748,7 +747,7 @@ static void perf_evsel__reset_callgraph(struct evsel *evsel, struct callchain_param *param) { - struct perf_event_attr *attr = &evsel->attr; + struct perf_event_attr *attr = &evsel->core.attr;perf_evsel__reset_sample_bit (evsel,CALLCHAIN );if (param->record_mode ==CALLCHAIN_LBR ) {@@ -767,7 +766,7 @@ static void apply_config_terms(struct evsel *evsel, {struct perf_evsel_config_term *term;struct list_head *config_terms = &evsel->config_terms; -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;/* callgraph default */ struct callchain_param param = { .record_mode = callchain_param.record_mode,@@ -880,7 +879,7 @@ static void apply_config_terms(struct evsel *evsel,if (sample_address) {perf_evsel__set_sample_bit (evsel,ADDR );perf_evsel__set_sample_bit (evsel,DATA_SRC ); - evsel->attr.mmap_data = track; + evsel->core.attr.mmap_data = track; }perf_evsel__config_callchain (evsel, opts, ¶m); }@@ -889,8 +888,8 @@ static void apply_config_terms(struct evsel *evsel,static bool is_dummy_event (struct evsel *evsel) { -return (evsel->attr.type ==PERF_TYPE_SOFTWARE ) && - (evsel->attr.config ==PERF_COUNT_SW_DUMMY ); +return (evsel->core.attr.type ==PERF_TYPE_SOFTWARE ) && + (evsel->core.attr.config ==PERF_COUNT_SW_DUMMY ); }/* @@ -925,7 +924,7 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts, struct callchain_param *callchain) {struct evsel *leader = evsel->leader; -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;int track = evsel->tracking;bool per_cpu = opts->target.default_per_cpu && !opts->target.per_thread;@@ -986,14 +985,14 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts,* event to follow the master sample_type to ease up * report. */ - attr->sample_type = leader->attr.sample_type; + attr->sample_type = leader->core.attr.sample_type; }if (opts->no_samples) attr->sample_freq =0 ;if (opts->inherit_stat) { - evsel->attr.read_format |= + evsel->core.attr.read_format |=PERF_FORMAT_TOTAL_TIME_ENABLED |PERF_FORMAT_TOTAL_TIME_RUNNING |PERF_FORMAT_ID ;@@ -1011,7 +1010,7 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts,* fault handler and its overall trickiness nature. */ if (perf_evsel__is_function_event (evsel)) - evsel->attr.exclude_callchain_user =1 ; + evsel->core.attr.exclude_callchain_user =1 ;if (callchain && callchain->enabled && !evsel->no_aux_samples)perf_evsel__config_callchain (evsel, opts, callchain);@@ -1080,7 +1079,7 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts,perf_evsel__set_sample_bit (evsel,TRANSACTION );if (opts->running_time) { - evsel->attr.read_format |= + evsel->core.attr.read_format |=PERF_FORMAT_TOTAL_TIME_ENABLED |PERF_FORMAT_TOTAL_TIME_RUNNING ; }@@ -1127,7 +1126,7 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts, }if (evsel->own_cpus || evsel->unit) - evsel->attr.read_format |=PERF_FORMAT_ID ; + evsel->core.attr.read_format |=PERF_FORMAT_ID ;/* * Apply event specific term settings, @@ -1382,7 +1381,7 @@ void perf_counts_values__scale(struct perf_counts_values *count,static int perf_evsel__read_size (struct evsel *evsel) { -u64 read_format = evsel->attr.read_format; +u64 read_format = evsel->core.attr.read_format;int entry =sizeof (u64);/* value */ int size =0 ;int nr =1 ;@@ -1448,7 +1447,7 @@ static int perf_evsel__process_group_data(struct evsel *leader, int cpu, int thread, u64 *data) { - u64 read_format = leader->attr.read_format; + u64 read_format = leader->core.attr.read_format;struct sample_read_value *v;u64 nr, ena =0 , run =0 , i;@@ -1486,7 +1485,7 @@ static int perf_evsel__read_group(struct evsel *leader, int cpu, int thread) { struct perf_stat_evsel *ps = leader->stats; -u64 read_format = leader->attr.read_format; +u64 read_format = leader->core.attr.read_format;int size =perf_evsel__read_size (leader);u64 *data = ps->group_data;@@ -1515,7 +1514,7 @@ perf_evsel__read_group(struct evsel *leader, int cpu, int thread)int perf_evsel__read_counter (struct evsel *evsel,int cpu,int thread) { -u64 read_format = evsel->attr.read_format; +u64 read_format = evsel->core.attr.read_format;if (read_format &PERF_FORMAT_GROUP )return perf_evsel__read_group (evsel, cpu, thread);@@ -1793,14 +1792,14 @@ static int perf_event_open(struct evsel *evsel, pid_t pid, int cpu, int group_fd, unsigned long flags) { - int precise_ip = evsel->attr.precise_ip; + int precise_ip = evsel->core.attr.precise_ip;int fd;while (1 ) {pr_debug2 ("sys_perf_event_open: pid %d cpu %d group_fd %d flags %#lx" , pid, cpu, group_fd, flags); - fd =sys_perf_event_open (&evsel->attr, pid, cpu, group_fd, flags); + fd =sys_perf_event_open (&evsel->core.attr, pid, cpu, group_fd, flags);if (fd >=0 )break ;@@ -1812,15 +1811,15 @@ static int perf_event_open(struct evsel *evsel,* We tried all the precise_ip values, and it's * still failing, so leave it to standard fallback. */ -if (!evsel->attr.precise_ip) { - evsel->attr.precise_ip = precise_ip; +if (!evsel->core.attr.precise_ip) { + evsel->core.attr.precise_ip = precise_ip;break ; }pr_debug2 ("\nsys_perf_event_open failed, error %d\n" , -ENOTSUP ); - evsel->attr.precise_ip--; -pr_debug2 ("decreasing precise_ip by one (%d)\n" , evsel->attr.precise_ip); -display_attr (&evsel->attr); + evsel->core.attr.precise_ip--; +pr_debug2 ("decreasing precise_ip by one (%d)\n" , evsel->core.attr.precise_ip); +display_attr (&evsel->core.attr); }return fd;@@ -1834,7 +1833,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,int pid =-1 , err;enum {NO_CHANGE ,SET_TO_MAX ,INCREASED_MAX } set_rlimit =NO_CHANGE ; -if (perf_missing_features.write_backward && evsel->attr.write_backward) +if (perf_missing_features.write_backward && evsel->core.attr.write_backward)return -EINVAL ;if (cpus ==NULL ) {@@ -1877,31 +1876,31 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, fallback_missing_features:if (perf_missing_features.clockid_wrong) - evsel->attr.clockid =CLOCK_MONOTONIC ;/* should always work */ + evsel->core.attr.clockid =CLOCK_MONOTONIC ;/* should always work */ if (perf_missing_features.clockid) { - evsel->attr.use_clockid =0 ; - evsel->attr.clockid =0 ; + evsel->core.attr.use_clockid =0 ; + evsel->core.attr.clockid =0 ; }if (perf_missing_features.cloexec) flags &= ~(unsigned long )PERF_FLAG_FD_CLOEXEC ;if (perf_missing_features.mmap2) - evsel->attr.mmap2 =0 ; + evsel->core.attr.mmap2 =0 ;if (perf_missing_features.exclude_guest) - evsel->attr.exclude_guest = evsel->attr.exclude_host =0 ; + evsel->core.attr.exclude_guest = evsel->core.attr.exclude_host =0 ;if (perf_missing_features.lbr_flags) - evsel->attr.branch_sample_type &= ~(PERF_SAMPLE_BRANCH_NO_FLAGS | + evsel->core.attr.branch_sample_type &= ~(PERF_SAMPLE_BRANCH_NO_FLAGS |PERF_SAMPLE_BRANCH_NO_CYCLES ); -if (perf_missing_features.group_read && evsel->attr.inherit) - evsel->attr.read_format &= ~(PERF_FORMAT_GROUP |PERF_FORMAT_ID ); +if (perf_missing_features.group_read && evsel->core.attr.inherit) + evsel->core.attr.read_format &= ~(PERF_FORMAT_GROUP |PERF_FORMAT_ID );if (perf_missing_features.ksymbol) - evsel->attr.ksymbol =0 ; + evsel->core.attr.ksymbol =0 ;if (perf_missing_features.bpf_event) - evsel->attr.bpf_event =0 ; + evsel->core.attr.bpf_event =0 ; retry_sample_id:if (perf_missing_features.sample_id_all) - evsel->attr.sample_id_all =0 ; + evsel->core.attr.sample_id_all =0 ; -display_attr (&evsel->attr); +display_attr (&evsel->core.attr);for (cpu =0 ; cpu < cpus->nr; cpu++) {@@ -2008,23 +2007,23 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,* Must probe features in the order they were added to the * perf_event_attr interface. */ -if (!perf_missing_features.bpf_event && evsel->attr.bpf_event) { +if (!perf_missing_features.bpf_event && evsel->core.attr.bpf_event) { perf_missing_features.bpf_event = true;pr_debug2 ("switching off bpf_event\n" ); goto fallback_missing_features; - }else if (!perf_missing_features.ksymbol && evsel->attr.ksymbol) { + }else if (!perf_missing_features.ksymbol && evsel->core.attr.ksymbol) { perf_missing_features.ksymbol = true;pr_debug2 ("switching off ksymbol\n" ); goto fallback_missing_features; - }else if (!perf_missing_features.write_backward && evsel->attr.write_backward) { + }else if (!perf_missing_features.write_backward && evsel->core.attr.write_backward) { perf_missing_features.write_backward = true;pr_debug2 ("switching off write_backward\n" ); goto out_close; - }else if (!perf_missing_features.clockid_wrong && evsel->attr.use_clockid) { + }else if (!perf_missing_features.clockid_wrong && evsel->core.attr.use_clockid) { perf_missing_features.clockid_wrong = true;pr_debug2 ("switching off clockid\n" ); goto fallback_missing_features; - }else if (!perf_missing_features.clockid && evsel->attr.use_clockid) { + }else if (!perf_missing_features.clockid && evsel->core.attr.use_clockid) { perf_missing_features.clockid = true;pr_debug2 ("switching off use_clockid\n" ); goto fallback_missing_features;@@ -2032,12 +2031,12 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, perf_missing_features.cloexec = true;pr_debug2 ("switching off cloexec flag\n" ); goto fallback_missing_features; - }else if (!perf_missing_features.mmap2 && evsel->attr.mmap2) { + }else if (!perf_missing_features.mmap2 && evsel->core.attr.mmap2) { perf_missing_features.mmap2 = true;pr_debug2 ("switching off mmap2\n" ); goto fallback_missing_features; }else if (!perf_missing_features.exclude_guest && - (evsel->attr.exclude_guest || evsel->attr.exclude_host)) { + (evsel->core.attr.exclude_guest || evsel->core.attr.exclude_host)) { perf_missing_features.exclude_guest = true;pr_debug2 ("switching off exclude_guest, exclude_host\n" ); goto fallback_missing_features;@@ -2046,15 +2045,15 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,pr_debug2 ("switching off sample_id_all\n" ); goto retry_sample_id; }else if (!perf_missing_features.lbr_flags && - (evsel->attr.branch_sample_type & + (evsel->core.attr.branch_sample_type & (PERF_SAMPLE_BRANCH_NO_CYCLES |PERF_SAMPLE_BRANCH_NO_FLAGS ))) { perf_missing_features.lbr_flags = true;pr_debug2 ("switching off branch sample type no (cycles/flags)\n" ); goto fallback_missing_features; }else if (!perf_missing_features.group_read && - evsel->attr.inherit && - (evsel->attr.read_format &PERF_FORMAT_GROUP ) && + evsel->core.attr.inherit && + (evsel->core.attr.read_format &PERF_FORMAT_GROUP ) &&perf_evsel__is_group_leader (evsel)) { perf_missing_features.group_read = true;pr_debug2 ("switching off group read\n" );@@ -2100,7 +2099,7 @@ static int perf_evsel__parse_id_sample(const struct evsel *evsel,const union perf_event *event, struct perf_sample *sample) { - u64 type = evsel->attr.sample_type; + u64 type = evsel->core.attr.sample_type;const u64 *array = event->sample.array;bool swapped = evsel->needs_swap;union u64_swap u;@@ -2189,7 +2188,7 @@ perf_event__check_size(union perf_event *event, unsigned int sample_size)int perf_evsel__parse_sample (struct evsel *evsel,union perf_event *event,struct perf_sample *data) { -u64 type = evsel->attr.sample_type; +u64 type = evsel->core.attr.sample_type;bool swapped = evsel->needs_swap;const u64 *array;u16 max_size = event->header.size;@@ -2205,14 +2204,14 @@ int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event,memset (data,0 ,sizeof (*data)); data->cpu = data->pid = data->tid =-1 ; data->stream_id = data->id = data->time =-1ULL ; - data->period = evsel->attr.sample_period; + data->period = evsel->core.attr.sample_period; data->cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; data->misc = event->header.misc; data->id =-1ULL ; data->data_src =PERF_MEM_DATA_SRC_NONE ;if (event->header.type !=PERF_RECORD_SAMPLE ) { -if (!evsel->attr.sample_id_all) +if (!evsel->core.attr.sample_id_all)return 0 ;return perf_evsel__parse_id_sample (evsel, event, data); }@@ -2285,7 +2284,7 @@ int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event, }if (type &PERF_SAMPLE_READ ) { -u64 read_format = evsel->attr.read_format; +u64 read_format = evsel->core.attr.read_format;OVERFLOW_CHECK_u64 (array);if (read_format &PERF_FORMAT_GROUP )@@ -2390,7 +2389,7 @@ int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event, array++;if (data->user_regs.abi) { -u64 mask = evsel->attr.sample_regs_user; +u64 mask = evsel->core.attr.sample_regs_user; sz =hweight64 (mask) *sizeof (u64);OVERFLOW_CHECK (array, sz, max_size);@@ -2446,7 +2445,7 @@ int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event, array++;if (data->intr_regs.abi !=PERF_SAMPLE_REGS_ABI_NONE ) { -u64 mask = evsel->attr.sample_regs_intr; +u64 mask = evsel->core.attr.sample_regs_intr; sz =hweight64 (mask) *sizeof (u64);OVERFLOW_CHECK (array, sz, max_size);@@ -2469,7 +2468,7 @@ int perf_evsel__parse_sample_timestamp(struct evsel *evsel,union perf_event *event, u64 *timestamp) { - u64 type = evsel->attr.sample_type; + u64 type = evsel->core.attr.sample_type;const u64 *array;if (!(type &PERF_SAMPLE_TIME ))@@ -2480,7 +2479,7 @@ int perf_evsel__parse_sample_timestamp(struct evsel *evsel, .time = -1ULL, }; -if (!evsel->attr.sample_id_all) +if (!evsel->core.attr.sample_id_all)return -1 ;if (perf_evsel__parse_id_sample (evsel, event, &data))return -1 ;@@ -2866,8 +2865,8 @@ bool perf_evsel__fallback(struct evsel *evsel, int err,int paranoid;if ((err ==ENOENT || err ==ENXIO || err ==ENODEV ) && - evsel->attr.type ==PERF_TYPE_HARDWARE && - evsel->attr.config ==PERF_COUNT_HW_CPU_CYCLES ) { + evsel->core.attr.type ==PERF_TYPE_HARDWARE && + evsel->core.attr.config ==PERF_COUNT_HW_CPU_CYCLES ) {/* * If it's cycles then fall back to hrtimer based * cpu-clock-tick sw counter, which is always available even if @@ -2879,12 +2878,12 @@ bool perf_evsel__fallback(struct evsel *evsel, int err,scnprintf (msg, msgsize,"%s" ,"The cycles event is not supported, trying to fall back to cpu-clock-ticks" ); - evsel->attr.type =PERF_TYPE_SOFTWARE ; - evsel->attr.config =PERF_COUNT_SW_CPU_CLOCK ; + evsel->core.attr.type =PERF_TYPE_SOFTWARE ; + evsel->core.attr.config =PERF_COUNT_SW_CPU_CLOCK ;zfree (&evsel->name);return true; - }else if (err ==EACCES && !evsel->attr.exclude_kernel && + }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {const char *name =perf_evsel__name (evsel);char *new_name;@@ -2903,7 +2902,7 @@ bool perf_evsel__fallback(struct evsel *evsel, int err, evsel->name = new_name;scnprintf (msg, msgsize,"kernel.perf_event_paranoid=%d, trying to fall back to excluding kernel samples" , paranoid); - evsel->attr.exclude_kernel =1 ; + evsel->core.attr.exclude_kernel =1 ;return true; }@@ -3000,15 +2999,15 @@ int perf_evsel__open_strerror(struct evsel *evsel, struct target *target, "No such device - did you specify an out-of-range profile CPU?");break ;case EOPNOTSUPP : -if (evsel->attr.sample_period !=0 ) +if (evsel->core.attr.sample_period !=0 )return scnprintf (msg, size,"%s: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat'" ,perf_evsel__name (evsel)); -if (evsel->attr.precise_ip) +if (evsel->core.attr.precise_ip)return scnprintf (msg, size,"%s" ,"\'precise\' request may not be supported. Try removing 'p' modifier." );#if defined(__i386__) || defined(__x86_64__) -if (evsel->attr.type ==PERF_TYPE_HARDWARE ) +if (evsel->core.attr.type ==PERF_TYPE_HARDWARE )return scnprintf (msg, size,"%s" ,"No hardware sampling interrupt available.\n" );#endif @@ -3020,7 +3019,7 @@ int perf_evsel__open_strerror(struct evsel *evsel, struct target *target, "We found oprofile daemon running, please stop it and try again.");break ;case EINVAL : -if (evsel->attr.write_backward && perf_missing_features.write_backward) +if (evsel->core.attr.write_backward && perf_missing_features.write_backward)return scnprintf (msg, size,"Reading from overwrite event is not supported by this kernel." );if (perf_missing_features.clockid)return scnprintf (msg, size,"clockid feature not supported." );tools/perf/util/evsel.h +8
-9@@ -103,7 +103,6 @@ struct bpf_object;struct evsel {struct perf_evsel core;struct evlist *evlist; -struct perf_event_attr attr;char *filter;struct xyarray *fd;struct xyarray *sample_id;@@ -327,21 +326,21 @@ u64 format_field__intval(struct tep_format_field *field, struct perf_sample *samstruct tep_format_field *perf_evsel__field (struct evsel *evsel,const char *name);#define perf_evsel__match (evsel, t, c) \ - (evsel->attr.type == PERF_TYPE_##t && \ - evsel->attr.config == PERF_COUNT_##c) + (evsel->core.attr.type == PERF_TYPE_##t && \ + evsel->core.attr.config == PERF_COUNT_##c)static inline bool perf_evsel__match2 (struct evsel *e1,struct evsel *e2) { -return (e1->attr.type == e2->attr.type) && - (e1->attr.config == e2->attr.config); +return (e1->core.attr.type == e2->core.attr.type) && + (e1->core.attr.config == e2->core.attr.config); }#define perf_evsel__cmp (a, b) \ ((a) && \ (b) && \ - (a)->attr.type == (b)->attr.type && \ - (a)->attr.config == (b)->attr.config) + (a)->core.attr.type == (b)->core.attr.type && \ + (a)->core.attr.config == (b)->core.attr.config)int perf_evsel__read (struct evsel *evsel,int cpu,int thread,struct perf_counts_values *count);@@ -490,12 +489,12 @@ for ((_evsel) = _leader; \static inline bool perf_evsel__has_branch_callstack (const struct evsel *evsel) { -return evsel->attr.branch_sample_type &PERF_SAMPLE_BRANCH_CALL_STACK ; +return evsel->core.attr.branch_sample_type &PERF_SAMPLE_BRANCH_CALL_STACK ; }static inline bool evsel__has_callchain (const struct evsel *evsel) { -return (evsel->attr.sample_type &PERF_SAMPLE_CALLCHAIN ) !=0 ; +return (evsel->core.attr.sample_type &PERF_SAMPLE_CALLCHAIN ) !=0 ; }typedef int (*attr__fprintf_f )(FILE *,const char *,const char *,void *);tools/perf/util/evsel_fprintf.c +4
-4@@ -60,22 +60,22 @@ int perf_evsel__fprintf(struct evsel *evsel, printed +=fprintf (fp,"%s" ,perf_evsel__name (evsel));if (details->verbose) { - printed +=perf_event_attr__fprintf (fp, &evsel->attr, + printed +=perf_event_attr__fprintf (fp, &evsel->core.attr, __print_attr__fprintf, &first); }else if (details->freq) {const char *term ="sample_freq" ; -if (!evsel->attr.freq) +if (!evsel->core.attr.freq) term ="sample_period" ; printed +=comma_fprintf (fp, &first," %s=%" PRIu64, - term, (u64 )evsel->attr.sample_freq); + term, (u64 )evsel->core.attr.sample_freq); }Lines of this file are not shown. View the raw message.
tools/perf/util/scripting-engines/trace-event-perl.c +3
-3Lines of this file are not shown. View the raw message.
tools/perf/util/scripting-engines/trace-event-python.c +7
-7Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0
Signature · 1 line
- Arnaldo
Part of the diff is not shown here. View the raw message.
tip-bot for Jiri Olsa
merge bot[tip:perf/core] libperf: Move perf_event_attr field from perf's evsel to libperf's perf_evsel
In reply to Jiri Olsalibperf: Move perf_event_attr field from perf's evsel to libperf's perf_evsel
Commit-ID: 1fc632cef4ea137bc45fd0fc4cb902e374064163 Gitweb: https://git.kernel.org/tip/1fc632cef4ea137bc45fd0fc4cb902e374064163 Author: Jiri Olsa <[email protected]> AuthorDate: Sun, 21 Jul 2019 13:24:29 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:45 -0300
libperf: Move perf_event_attr field from perf's evsel to libperf's perf_evsel
Move the perf_event_attr struct fron 'struct evsel' to 'struct perf_evsel'.
Committer notes:
Fixed up these:
tools/perf/arch/arm/util/auxtrace.c
tools/perf/arch/arm/util/cs-etm.c
tools/perf/arch/arm64/util/arm-spe.c
tools/perf/arch/s390/util/auxtrace.c
tools/perf/util/cs-etm.c
Also
cc1: warnings being treated as errors
tests/sample-parsing.c: In function 'do_test':
tests/sample-parsing.c:162: error: missing initializer tests/sample-parsing.c:162: error: (near initialization for 'evsel.core.cpus')
struct evsel evsel = {
.needs_swap = false,
- .core.attr = {
- .sample_type = sample_type,
- .read_format = read_format,
+ .core = {
+ . attr = {
+ .sample_type = sample_type,
+ .read_format = read_format,
+ },
[perfbuilder@a70e4eeb5549 /]$ gcc --version |& head -1 gcc (GCC) 4.4.7
Also we don't need to include perf_event.h in tools/perf/lib/include/perf/evsel.h, forward declaring 'struct perf_event_attr' is enough. And this even fixes the build in some systems where things are used somewhere down the include path from perf_event.h without defining __always_inline.
--- tools/perf/arch/arm/util/auxtrace.c | 4 +- tools/perf/arch/arm/util/cs-etm.c | 28 +- tools/perf/arch/arm64/util/arm-spe.c | 12 +- tools/perf/arch/s390/util/auxtrace.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 6 +- tools/perf/arch/x86/util/auxtrace.c | 4 +- tools/perf/arch/x86/util/intel-bts.c | 16 +- tools/perf/arch/x86/util/intel-pt.c | 40 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-inject.c | 14 +- tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-script.c | 52 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-timechart.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 32 +- tools/perf/lib/evsel.c | 3 +- tools/perf/lib/include/internal/evsel.h | 4 + tools/perf/lib/include/perf/evsel.h | 4 +- tools/perf/tests/code-reading.c | 6 +- tools/perf/tests/event-times.c | 8 +- tools/perf/tests/keep-tracking.c | 6 +- tools/perf/tests/mmap-basic.c | 2 +- tools/perf/tests/parse-events.c | 872 ++++++++++----------- tools/perf/tests/sample-parsing.c | 12 +- tools/perf/tests/switch-tracking.c | 8 +- tools/perf/tests/task-exit.c | 14 +- tools/perf/ui/browsers/res_sample.c | 2 +- tools/perf/ui/browsers/scripts.c | 2 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/bpf-loader.c | 2 +- tools/perf/util/cs-etm.c | 20 +- tools/perf/util/data-convert-bt.c | 14 +- tools/perf/util/db-export.c | 4 +- tools/perf/util/evlist.c | 50 +- tools/perf/util/evsel.c | 167 ++-- tools/perf/util/evsel.h | 17 +- tools/perf/util/evsel_fprintf.c | 8 +- tools/perf/util/header.c | 28 +- tools/perf/util/hist.c | 2 +- tools/perf/util/intel-bts.c | 18 +- tools/perf/util/intel-pt.c | 50 +- tools/perf/util/jitdump.c | 4 +- tools/perf/util/machine.c | 4 +- tools/perf/util/parse-events.c | 40 +- tools/perf/util/python.c | 6 +- tools/perf/util/record.c | 16 +- tools/perf/util/s390-cpumsf.c | 2 +- tools/perf/util/s390-sample-raw.c | 2 +- .../perf/util/scripting-engines/trace-event-perl.c | 6 +- .../util/scripting-engines/trace-event-python.c | 14 +- tools/perf/util/session.c | 20 +- tools/perf/util/sort.c | 12 +- tools/perf/util/stat-display.c | 8 +- tools/perf/util/stat-shadow.c | 30 +- tools/perf/util/stat.c | 2 +- tools/perf/util/top.c | 2 +- tools/perf/util/trace-event-info.c | 6 +- 59 files changed, 864 insertions(+), 857 deletions(-)
tools/perf/arch/arm/util/auxtrace.c +2 -2
@@ -70,14 +70,14 @@ struct auxtrace_recordevlist__for_each_entry (evlist, evsel) {if (cs_etm_pmu && - evsel->attr.type == cs_etm_pmu->type) + evsel->core.attr.type == cs_etm_pmu->type) found_etm = true;if (!nr_spes)continue ;for (i =0 ; i < nr_spes; i++) { -if (evsel->attr.type == arm_spe_pmus[i]->type) { +if (evsel->core.attr.type == arm_spe_pmus[i]->type) { found_spe = true;break ; }
tools/perf/arch/arm/util/cs-etm.c +14 -14
@@ -95,7 +95,7 @@ static int cs_etm_set_context_id(struct auxtrace_record *itr, }/* All good, let the kernel know */ - evsel->attr.config |= (1 <<ETM_OPT_CTXTID ); + evsel->core.attr.config |= (1 <<ETM_OPT_CTXTID ); err =0 ; out:
@@ -144,7 +144,7 @@ static int cs_etm_set_timestamp(struct auxtrace_record *itr, }/* All good, let the kernel know */ - evsel->attr.config |= (1 <<ETM_OPT_TS ); + evsel->core.attr.config |= (1 <<ETM_OPT_TS ); err =0 ; out:
@@ -215,7 +215,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu,int ret = -EINVAL ;u32 hash; -if (evsel->attr.config2 &GENMASK (31 ,0 )) +if (evsel->core.attr.config2 &GENMASK (31 ,0 ))return 0 ;list_for_each_entry (term, &evsel->config_terms, list) {
@@ -233,7 +233,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu,return ret; } - evsel->attr.config2 |= hash; + evsel->core.attr.config2 |= hash;return 0 ; }
@@ -264,14 +264,14 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, opts->record_switch_events = true;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == cs_etm_pmu->type) { +if (evsel->core.attr.type == cs_etm_pmu->type) {if (cs_etm_evsel) {pr_err ("There may be only one %s event\n" ,CORESIGHT_ETM_PMU_NAME );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; cs_etm_evsel = evsel; opts->full_auxtrace = true; }
@@ -416,8 +416,8 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, tracking_evsel =perf_evlist__last (evlist);perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ;/* In per-cpu case, always need the time of mmap events etc */ if (!cpu_map__empty (cpus))
@@ -438,7 +438,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == cs_etm_pmu->type) { +if (evsel->core.attr.type == cs_etm_pmu->type) {/* * Variable perf_event_attr::config is assigned to * ETMv3/PTM. The bit fields have been made to match
@@ -447,7 +447,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr)* drivers/hwtracing/coresight/coresight-perf.c for * details. */ - config = evsel->attr.config; + config = evsel->core.attr.config;break ; } }
@@ -820,7 +820,7 @@ static int cs_etm_snapshot_start(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->cs_etm_pmu->type) +if (evsel->core.attr.type == ptr->cs_etm_pmu->type)return evsel__disable (evsel); }return -EINVAL ;
@@ -833,7 +833,7 @@ static int cs_etm_snapshot_finish(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->cs_etm_pmu->type) +if (evsel->core.attr.type == ptr->cs_etm_pmu->type)return evsel__enable (evsel); }return -EINVAL ;
@@ -861,7 +861,7 @@ static int cs_etm_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->cs_etm_pmu->type) +if (evsel->core.attr.type == ptr->cs_etm_pmu->type)return perf_evlist__enable_event_idx (ptr->evlist, evsel, idx); }
tools/perf/arch/arm64/util/arm-spe.c +6 -6
@@ -73,13 +73,13 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, sper->evlist = evlist;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == arm_spe_pmu->type) { +if (evsel->core.attr.type == arm_spe_pmu->type) {if (arm_spe_evsel) {pr_err ("There may be only one " ARM_SPE_PMU_NAME "x event\n" );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; arm_spe_evsel = evsel; opts->full_auxtrace = true; }
@@ -130,8 +130,8 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, tracking_evsel =perf_evlist__last (evlist);perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ;perf_evsel__set_sample_bit (tracking_evsel,TIME );perf_evsel__set_sample_bit (tracking_evsel,CPU );perf_evsel__reset_sample_bit (tracking_evsel,BRANCH_STACK );
@@ -163,7 +163,7 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (sper->evlist, evsel) { -if (evsel->attr.type == sper->arm_spe_pmu->type) +if (evsel->core.attr.type == sper->arm_spe_pmu->type)return perf_evlist__enable_event_idx (sper->evlist, evsel, idx); }
tools/perf/arch/s390/util/auxtrace.c +1 -1
@@ -94,7 +94,7 @@ struct auxtrace_record *auxtrace_record__init(struct evlist *evlist,return NULL ;evlist__for_each_entry (evlist, pos) { -if (pos->attr.config ==PERF_EVENT_CPUM_SF_DIAG ) { +if (pos->core.attr.config ==PERF_EVENT_CPUM_SF_DIAG ) { diagnose =1 ;break ; }
tools/perf/arch/x86/tests/perf-time-to-tsc.c +3 -3
@@ -79,9 +79,9 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ;CHECK__ (evlist__open (evlist));
tools/perf/arch/x86/util/auxtrace.c +2 -2
@@ -29,9 +29,9 @@ struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist, intel_bts_pmu =perf_pmu__find (INTEL_BTS_PMU_NAME );evlist__for_each_entry (evlist, evsel) { -if (intel_pt_pmu && evsel->attr.type == intel_pt_pmu->type) +if (intel_pt_pmu && evsel->core.attr.type == intel_pt_pmu->type) found_pt = true; -if (intel_bts_pmu && evsel->attr.type == intel_bts_pmu->type) +if (intel_bts_pmu && evsel->core.attr.type == intel_bts_pmu->type) found_bts = true; }
tools/perf/arch/x86/util/intel-bts.c +8 -8
@@ -113,13 +113,13 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, btsr->snapshot_mode = opts->auxtrace_snapshot_mode;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_bts_pmu->type) { +if (evsel->core.attr.type == intel_bts_pmu->type) {if (intel_bts_evsel) {pr_err ("There may be only one " INTEL_BTS_PMU_NAME " event\n" );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; intel_bts_evsel = evsel; opts->full_auxtrace = true; }
@@ -231,8 +231,8 @@ static int intel_bts_recording_options(struct auxtrace_record *itr,perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ; }return 0 ;
@@ -316,7 +316,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return evsel__disable (evsel); }return -EINVAL ;
@@ -329,7 +329,7 @@ static int intel_bts_snapshot_finish(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return evsel__enable (evsel); }return -EINVAL ;
@@ -411,7 +411,7 @@ static int intel_bts_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (btsr->evlist, evsel) { -if (evsel->attr.type == btsr->intel_bts_pmu->type) +if (evsel->core.attr.type == btsr->intel_bts_pmu->type)return perf_evlist__enable_event_idx (btsr->evlist, evsel, idx); }
tools/perf/arch/x86/util/intel-pt.c +20 -20
@@ -122,8 +122,8 @@ static int intel_pt_read_config(struct perf_pmu *intel_pt_pmu, const char *str,return -EINVAL ;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) { - *res =intel_pt_masked_bits (mask, evsel->attr.config); +if (evsel->core.attr.type == intel_pt_pmu->type) { + *res =intel_pt_masked_bits (mask, evsel->core.attr.config);return 0 ; } }
@@ -274,7 +274,7 @@ static const char *intel_pt_find_filter(struct evlist *evlist,struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) +if (evsel->core.attr.type == intel_pt_pmu->type)return evsel->filter; }
@@ -526,26 +526,26 @@ static int intel_pt_validate_config(struct perf_pmu *intel_pt_pmu,* sets pt=0, which avoids senseless kernel errors. */ if (perf_pmu__scan_file (intel_pt_pmu,"format/pt" ,"%c" , &c) ==1 && - !(evsel->attr.config &1 )) { + !(evsel->core.attr.config &1 )) {pr_warning ("pt=0 doesn't make sense, forcing pt=1\n" ); - evsel->attr.config |=1 ; + evsel->core.attr.config |=1 ; } err =intel_pt_val_config_term (intel_pt_pmu,"caps/cycle_thresholds" ,"cyc_thresh" ,"caps/psb_cyc" , - evsel->attr.config); + evsel->core.attr.config);if (err)return err; err =intel_pt_val_config_term (intel_pt_pmu,"caps/mtc_periods" ,"mtc_period" ,"caps/mtc" , - evsel->attr.config); + evsel->core.attr.config);if (err)return err;return intel_pt_val_config_term (intel_pt_pmu,"caps/psb_periods" ,"psb_period" ,"caps/psb_cyc" , - evsel->attr.config); + evsel->core.attr.config); } static int intel_pt_recording_options(struct auxtrace_record *itr,
@@ -566,13 +566,13 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, ptr->snapshot_mode = opts->auxtrace_snapshot_mode;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == intel_pt_pmu->type) { +if (evsel->core.attr.type == intel_pt_pmu->type) {if (intel_pt_evsel) {pr_err ("There may be only one " INTEL_PT_PMU_NAME " event\n" );return -EINVAL ; } - evsel->attr.freq =0 ; - evsel->attr.sample_period =1 ; + evsel->core.attr.freq =0 ; + evsel->core.attr.sample_period =1 ; intel_pt_evsel = evsel; opts->full_auxtrace = true; }
@@ -670,7 +670,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,intel_pt_parse_terms (&intel_pt_pmu->format,"tsc" , &tsc_bit); -if (opts->full_auxtrace && (intel_pt_evsel->attr.config & tsc_bit)) +if (opts->full_auxtrace && (intel_pt_evsel->core.attr.config & tsc_bit)) have_timing_info = true;else have_timing_info = false;
@@ -693,9 +693,9 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, switch_evsel =perf_evlist__last (evlist); - switch_evsel->attr.freq =0 ; - switch_evsel->attr.sample_period =1 ; - switch_evsel->attr.context_switch =1 ; + switch_evsel->core.attr.freq =0 ; + switch_evsel->core.attr.sample_period =1 ; + switch_evsel->core.attr.context_switch =1 ; switch_evsel->system_wide = true; switch_evsel->no_aux_samples = true;
@@ -753,8 +753,8 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ; tracking_evsel->no_aux_samples = true;if (need_immediate)
@@ -787,7 +787,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return evsel__disable (evsel); }return -EINVAL ;
@@ -800,7 +800,7 @@ static int intel_pt_snapshot_finish(struct auxtrace_record *itr)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return evsel__enable (evsel); }return -EINVAL ;
@@ -1073,7 +1073,7 @@ static int intel_pt_read_finish(struct auxtrace_record *itr, int idx)struct evsel *evsel;evlist__for_each_entry (ptr->evlist, evsel) { -if (evsel->attr.type == ptr->intel_pt_pmu->type) +if (evsel->core.attr.type == ptr->intel_pt_pmu->type)return perf_evlist__enable_event_idx (ptr->evlist, evsel, idx); }
tools/perf/builtin-evlist.c +1 -1
@@ -36,7 +36,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *detailsevlist__for_each_entry (session->evlist, pos) {perf_evsel__fprintf (pos, details, stdout); -if (pos->attr.type ==PERF_TYPE_TRACEPOINT ) +if (pos->core.attr.type ==PERF_TYPE_TRACEPOINT ) has_tracepoint = true; }
tools/perf/builtin-inject.c +7 -7
@@ -530,8 +530,8 @@ found: sample_sw.period = sample->period; sample_sw.time = sample->time; -perf_event__synthesize_sample (event_sw, evsel->attr.sample_type, - evsel->attr.read_format, &sample_sw); +perf_event__synthesize_sample (event_sw, evsel->core.attr.sample_type, + evsel->core.attr.read_format, &sample_sw);build_id__mark_dso_hit (tool, event_sw, &sample_sw, evsel, machine);return perf_event__repipe (tool, event_sw, &sample_sw, machine); }
@@ -544,7 +544,7 @@ static void sig_handler(int sig __maybe_unused)static int perf_evsel__check_stype (struct evsel *evsel,u64 sample_type,const char *sample_msg) { -struct perf_event_attr *attr = &evsel->attr; +struct perf_event_attr *attr = &evsel->core.attr;const char *name =perf_evsel__name (evsel);if (!(attr->sample_type & sample_type)) {
@@ -578,8 +578,8 @@ static void strip_init(struct perf_inject *inject)static bool has_tracking (struct evsel *evsel) { -return evsel->attr.mmap || evsel->attr.mmap2 || evsel->attr.comm || - evsel->attr.task; +return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || + evsel->core.attr.task; }#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \
@@ -603,8 +603,8 @@ static bool ok_to_remove(struct evlist *evlist,evlist__for_each_entry (evlist, evsel) {if (evsel->handler != drop_sample) { cnt +=1 ; -if ((evsel->attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->attr.sample_type &COMPAT_MASK )) +if ((evsel->core.attr.sample_type &COMPAT_MASK ) == + (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) ok = true; } }
tools/perf/builtin-kvm.c +1 -1
@@ -1022,7 +1022,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)* This command processes KVM tracepoints from host only */ evlist__for_each_entry (evlist, pos) { -struct perf_event_attr *attr = &pos->attr; +struct perf_event_attr *attr = &pos->core.attr;/* make sure these *are* set */ perf_evsel__set_sample_bit (pos,TID );
tools/perf/builtin-record.c +1 -1
@@ -732,7 +732,7 @@ static int record__open(struct record *rec) pos->tracking =0 ; pos =perf_evlist__last (evlist); pos->tracking =1 ; - pos->attr.enable_on_exec =1 ; + pos->core.attr.enable_on_exec =1 ; }perf_evlist__config (evlist, opts, &callchain_param);
tools/perf/builtin-script.c +26 -26
191 lines not on this page · raw message
tools/perf/builtin-stat.c +1 -1
@@ -391,7 +391,7 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *infstatic bool perf_evsel__should_store_id (struct evsel *counter) { -return STAT_RECORD || counter->attr.read_format &PERF_FORMAT_ID ; +return STAT_RECORD || counter->core.attr.read_format &PERF_FORMAT_ID ; } static bool is_target_alive(struct target *_target,
tools/perf/builtin-timechart.c +1 -1
@@ -557,7 +557,7 @@ static int process_sample_event(struct perf_tool *tool, { struct timechart *tchart = container_of(tool, struct timechart, tool); -if (evsel->attr.sample_type &PERF_SAMPLE_TIME ) { +if (evsel->core.attr.sample_type &PERF_SAMPLE_TIME ) {if (!tchart->first_time || tchart->first_time > sample->time) tchart->first_time = sample->time;if (tchart->last_time < sample->time)
tools/perf/builtin-top.c +1 -1
@@ -966,7 +966,7 @@ static int perf_top_overwrite_fallback(struct perf_top *top,return 0 ;evlist__for_each_entry (evlist, counter) - counter->attr.write_backward = false; + counter->core.attr.write_backward = false; opts->overwrite = false;pr_debug2 ("fall back to non-overwrite mode\n" );return 1 ;
tools/perf/builtin-trace.c +16 -16
@@ -2046,8 +2046,8 @@ static int trace__resolve_callchain(struct trace *trace, struct evsel *evsel, struct callchain_cursor *cursor) {struct addr_location al; -int max_stack = evsel->attr.sample_max_stack ? - evsel->attr.sample_max_stack : +int max_stack = evsel->core.attr.sample_max_stack ? + evsel->core.attr.sample_max_stack : trace->max_stack;int err;
@@ -2462,7 +2462,7 @@ static int trace__pgfault(struct trace *trace,if (ttrace ==NULL ) goto out_put; -if (evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ) +if (evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ) ttrace->pfmaj++;else ttrace->pfmin++;
@@ -2475,7 +2475,7 @@ static int trace__pgfault(struct trace *trace,trace__fprintf_entry_head (trace, thread,0 , true, sample->time, trace->output);fprintf (trace->output,"%sfault [" , - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ? + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ ?"maj" :"min" );print_location (trace->output, sample, &al, false, true);
@@ -2523,7 +2523,7 @@ static void trace__set_base_time(struct trace *trace,* appears in our event stream (vfs_getname comes to mind). */ if (trace->base_time ==0 && !trace->full_time && - (evsel->attr.sample_type &PERF_SAMPLE_TIME )) + (evsel->core.attr.sample_type &PERF_SAMPLE_TIME )) trace->base_time = sample->time; }
@@ -2682,7 +2682,7 @@ static void trace__handle_event(struct trace *trace, union perf_event *event, sttrace__set_base_time (trace, evsel, sample); -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT && +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT && sample->raw_data ==NULL ) { fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n", perf_evsel__name(evsel), sample->tid,
@@ -2728,7 +2728,7 @@ static int trace__add_syscall_newtp(struct trace *trace)* leading to the syscall, allow overriding that for * debugging reasons using --kernel_syscall_callchains */ - sys_exit->attr.exclude_callchain_kernel =1 ; + sys_exit->core.attr.exclude_callchain_kernel =1 ; } trace->syscalls.events.sys_enter = sys_enter;
@@ -3414,18 +3414,18 @@ static int trace__run(struct trace *trace, int argc, const char **argv) trace->multiple_threads =thread_map__pid (evlist->threads,0 ) ==-1 || evlist->threads->nr >1 || -perf_evlist__first (evlist)->attr.inherit; +perf_evlist__first (evlist)->core.attr.inherit;/* -* Now that we already used evsel->attr to ask the kernel to setup the -* events, lets reuse evsel->attr.sample_max_stack as the limit in +* Now that we already used evsel->core.attr to ask the kernel to setup the +* events, lets reuse evsel->core.attr.sample_max_stack as the limit in * trace__resolve_callchain(), allowing per-event max-stack settings * to override an explicitly set --max-stack global setting. */ evlist__for_each_entry (evlist, evsel) {if (evsel__has_callchain (evsel) && - evsel->attr.sample_max_stack ==0 ) - evsel->attr.sample_max_stack = trace->max_stack; + evsel->core.attr.sample_max_stack ==0 ) + evsel->core.attr.sample_max_stack = trace->max_stack; } again: before = trace->nr_events;
@@ -3618,10 +3618,10 @@ static int trace__replay(struct trace *trace) }evlist__for_each_entry (session->evlist, evsel) { -if (evsel->attr.type ==PERF_TYPE_SOFTWARE && - (evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ || - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MIN || - evsel->attr.config ==PERF_COUNT_SW_PAGE_FAULTS )) +if (evsel->core.attr.type ==PERF_TYPE_SOFTWARE && + (evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MAJ || + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS_MIN || + evsel->core.attr.config ==PERF_COUNT_SW_PAGE_FAULTS )) evsel->handler = trace__pgfault; }
tools/perf/lib/evsel.c +2 -1
@@ -3,7 +3,8 @@#include <linux/list.h> #include <internal/evsel.h> -void perf_evsel__init (struct perf_evsel *evsel) +void perf_evsel__init (struct perf_evsel *evsel,struct perf_event_attr *attr) {INIT_LIST_HEAD (&evsel->node); + evsel->attr = *attr; }
tools/perf/lib/include/internal/evsel.h +4 -0
@@ -2,8 +2,12 @@#ifndef __LIBPERF_INTERNAL_EVSEL_H#define __LIBPERF_INTERNAL_EVSEL_H +#include <linux/types.h> +#include <linux/perf_event.h> +struct perf_evsel {struct list_head node; +struct perf_event_attr attr; };#endif /* __LIBPERF_INTERNAL_EVSEL_H */
tools/perf/lib/include/perf/evsel.h +3 -1
@@ -5,7 +5,9 @@#include <perf/core.h> struct perf_evsel ; +struct perf_event_attr ; -LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel); +LIBPERF_API void perf_evsel__init(struct perf_evsel *evsel, +struct perf_event_attr *attr);#endif /* __LIBPERF_EVSEL_H */
tools/perf/tests/code-reading.c +3 -3
@@ -642,9 +642,9 @@ static int do_test_code_reading(bool try_kcore) evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ; ret =evlist__open (evlist);if (ret <0 ) {
tools/perf/tests/event-times.c +4 -4
@@ -36,7 +36,7 @@ static int attach__enable_on_exec(struct evlist *evlist)return err; } - evsel->attr.enable_on_exec =1 ; + evsel->core.attr.enable_on_exec =1 ; err =evlist__open (evlist);if (err <0 ) {
@@ -68,7 +68,7 @@ static int attach__current_disabled(struct evlist *evlist)return -1 ; } - evsel->attr.disabled =1 ; + evsel->core.attr.disabled =1 ; err =perf_evsel__open_per_thread (evsel, threads);if (err) {
@@ -121,7 +121,7 @@ static int attach__cpu_disabled(struct evlist *evlist)return -1 ; } - evsel->attr.disabled =1 ; + evsel->core.attr.disabled =1 ; err =perf_evsel__open_per_cpu (evsel, cpus);if (err) {
@@ -179,7 +179,7 @@ static int test_times(int (attach)(struct evlist *), } evsel =perf_evlist__last (evlist); - evsel->attr.read_format |= + evsel->core.attr.read_format |=PERF_FORMAT_TOTAL_TIME_ENABLED |PERF_FORMAT_TOTAL_TIME_RUNNING ;
tools/perf/tests/keep-tracking.c +3 -3
@@ -90,9 +90,9 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un evsel =perf_evlist__first (evlist); - evsel->attr.comm =1 ; - evsel->attr.disabled =1 ; - evsel->attr.enable_on_exec =0 ; + evsel->core.attr.comm =1 ; + evsel->core.attr.disabled =1 ; + evsel->core.attr.enable_on_exec =0 ;if (evlist__open (evlist) <0 ) {pr_debug ("Unable to open dummy and cycles event\n" );
tools/perf/tests/mmap-basic.c +1 -1
@@ -79,7 +79,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse goto out_delete_evlist; } - evsels[i]->attr.wakeup_events =1 ; + evsels[i]->core.attr.wakeup_events =1 ;perf_evsel__set_sample_id (evsels[i], false);evlist__add (evlist, evsels[i]);
tools/perf/tests/parse-events.c +436 -436
1,420 lines not on this page · raw message
tools/perf/tests/sample-parsing.c +7 -5
@@ -155,9 +155,11 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) {struct evsel evsel = { .needs_swap = false, - .attr = { - .sample_type = sample_type, - .read_format = read_format, + .core = { + . attr = { + .sample_type = sample_type, + .read_format = read_format, + }, }, };union perf_event *event;
@@ -221,10 +223,10 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)int err, ret =-1 ;if (sample_type &PERF_SAMPLE_REGS_USER ) - evsel.attr.sample_regs_user = sample_regs; + evsel.core.attr.sample_regs_user = sample_regs;if (sample_type &PERF_SAMPLE_REGS_INTR ) - evsel.attr.sample_regs_intr = sample_regs; + evsel.core.attr.sample_regs_intr = sample_regs;for (i =0 ; i <sizeof (regs); i++) *(i + (u8 *)regs) = i &0xfe ;
tools/perf/tests/switch-tracking.c +4 -4
@@ -420,8 +420,8 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_perf_evlist__set_tracking_event (evlist, tracking_evsel); - tracking_evsel->attr.freq =0 ; - tracking_evsel->attr.sample_period =1 ; + tracking_evsel->core.attr.freq =0 ; + tracking_evsel->core.attr.sample_period =1 ;perf_evsel__set_sample_bit (tracking_evsel,TIME );
@@ -435,7 +435,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ }/* Check tracking event is tracking */ -if (!tracking_evsel->attr.mmap || !tracking_evsel->attr.comm) { +if (!tracking_evsel->core.attr.mmap || !tracking_evsel->core.attr.comm) {pr_debug ("Tracking event not tracking\n" ); goto out_err; }
@@ -443,7 +443,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_/* Check non-tracking events are not tracking */ evlist__for_each_entry (evlist, evsel) {if (evsel != tracking_evsel) { -if (evsel->attr.mmap || evsel->attr.comm) { +if (evsel->core.attr.mmap || evsel->core.attr.comm) {pr_debug ("Non-tracking event is tracking\n" ); goto out_err; }
tools/perf/tests/task-exit.c +7 -7
@@ -84,16 +84,16 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused } evsel =perf_evlist__first (evlist); - evsel->attr.task =1 ; + evsel->core.attr.task =1 ;#ifdef __s390x__ - evsel->attr.sample_freq =1000000 ; + evsel->core.attr.sample_freq =1000000 ;#else - evsel->attr.sample_freq =1 ; + evsel->core.attr.sample_freq =1 ;#endif - evsel->attr.inherit =0 ; - evsel->attr.watermark =0 ; - evsel->attr.wakeup_events =1 ; - evsel->attr.exclude_kernel =1 ; + evsel->core.attr.inherit =0 ; + evsel->core.attr.watermark =0 ; + evsel->core.attr.wakeup_events =1 ; + evsel->core.attr.exclude_kernel =1 ; err =evlist__open (evlist);if (err <0 ) {
tools/perf/ui/browsers/res_sample.c +1 -1
@@ -66,7 +66,7 @@ int res_sample_browse(struct res_sample *res_samples, int num_res,timestamp__scnprintf_nsec (r->time, tsample,sizeof tsample); -attr_to_script (extra_format, &evsel->attr); +attr_to_script (extra_format, &evsel->core.attr); if (asprintf(&cmd, "%s script %s%s --time %s %s%s %s%s --ns %s %s %s %s %s | less +/%s", perf,
tools/perf/ui/browsers/scripts.c +1 -1
@@ -100,7 +100,7 @@ static int list_scripts(char *script_name, bool *custom,return -1 ;if (evsel) -attr_to_script (scriptc.extra_format, &evsel->attr); +attr_to_script (scriptc.extra_format, &evsel->core.attr);add_script_option ("Show individual samples" ,"" , &scriptc);add_script_option ("Show individual samples with assembler" ,"-F +insn --xed" , &scriptc);
tools/perf/util/auxtrace.c +1 -1
@@ -2140,7 +2140,7 @@ static struct perf_pmu *perf_evsel__find_pmu(struct evsel *evsel)struct perf_pmu *pmu =NULL ;while ((pmu =perf_pmu__scan (pmu)) !=NULL ) { -if (pmu->type == evsel->attr.type) +if (pmu->type == evsel->core.attr.type)break ; }
tools/perf/util/bpf-loader.c +1 -1
@@ -1421,7 +1421,7 @@ apply_config_evsel_for_key(const char *name, int map_fd, void *pkey,return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTDIM ; } - attr = &evsel->attr; + attr = &evsel->core.attr;if (attr->inherit) {pr_debug ("ERROR: Can't put inherit event into map %s\n" , name);return -BPF_LOADER_ERRNO__OBJCONF_MAP_EVTINH ;
tools/perf/util/cs-etm.c +10 -10
@@ -1230,7 +1230,7 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm,int err;evlist__for_each_entry (evlist, evsel) { -if (evsel->attr.type == etm->pmu_type) { +if (evsel->core.attr.type == etm->pmu_type) { found = true;break ; }
@@ -1244,7 +1244,7 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm,memset (&attr,0 ,sizeof (struct perf_event_attr )); attr.size =sizeof (struct perf_event_attr ); attr.type =PERF_TYPE_HARDWARE ; - attr.sample_type = evsel->attr.sample_type &PERF_SAMPLE_MASK ; + attr.sample_type = evsel->core.attr.sample_type &PERF_SAMPLE_MASK ; attr.sample_type |=PERF_SAMPLE_IP |PERF_SAMPLE_TID |PERF_SAMPLE_PERIOD ;if (etm->timeless_decoding)
@@ -1252,13 +1252,13 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm,else attr.sample_type |=PERF_SAMPLE_TIME ; - attr.exclude_user = evsel->attr.exclude_user; - attr.exclude_kernel = evsel->attr.exclude_kernel; - attr.exclude_hv = evsel->attr.exclude_hv; - attr.exclude_host = evsel->attr.exclude_host; - attr.exclude_guest = evsel->attr.exclude_guest; - attr.sample_id_all = evsel->attr.sample_id_all; - attr.read_format = evsel->attr.read_format; + attr.exclude_user = evsel->core.attr.exclude_user; + attr.exclude_kernel = evsel->core.attr.exclude_kernel; + attr.exclude_hv = evsel->core.attr.exclude_hv; + attr.exclude_host = evsel->core.attr.exclude_host; + attr.exclude_guest = evsel->core.attr.exclude_guest; + attr.sample_id_all = evsel->core.attr.sample_id_all; + attr.read_format = evsel->core.attr.read_format;/* create new id val to be a fixed offset from evsel id */ id = evsel->id[0 ] +1000000000 ;
@@ -2303,7 +2303,7 @@ static bool cs_etm__is_timeless_decoding(struct cs_etm_auxtrace *etm)* with the time bit set. */ evlist__for_each_entry (evlist, evsel) { -if ((evsel->attr.sample_type &PERF_SAMPLE_TIME )) +if ((evsel->core.attr.sample_type &PERF_SAMPLE_TIME )) timeless_decoding = false; }
tools/perf/util/data-convert-bt.c +7 -7
@@ -587,7 +587,7 @@ static int add_generic_values(struct ctf_writer *cw,struct evsel *evsel, struct perf_sample *sample) { - u64 type = evsel->attr.sample_type; + u64 type = evsel->core.attr.sample_type;int ret;/*
@@ -757,7 +757,7 @@ static int get_sample_cpu(struct ctf_writer *cw, struct perf_sample *sample, {int cpu =0 ; -if (evsel->attr.sample_type &PERF_SAMPLE_CPU ) +if (evsel->core.attr.sample_type &PERF_SAMPLE_CPU ) cpu = sample->cpu;if (cpu > cw->stream_cnt) {
@@ -795,7 +795,7 @@ static int process_sample_event(struct perf_tool *tool,struct bt_ctf_event_class *event_class;struct bt_ctf_event *event;int ret; -unsigned long type = evsel->attr.sample_type; +unsigned long type = evsel->core.attr.sample_type;if (WARN_ONCE (!priv,"Failed to setup all events.\n" ))return 0 ;
@@ -820,7 +820,7 @@ static int process_sample_event(struct perf_tool *tool,if (ret)return -1 ; -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT ) { +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) { ret =add_tracepoint_values (cw, event_class, event, evsel, sample);if (ret)
@@ -1087,7 +1087,7 @@ static int add_bpf_output_types(struct ctf_writer *cw,static int add_generic_types (struct ctf_writer *cw,struct evsel *evsel,struct bt_ctf_event_class *event_class) { -u64 type = evsel->attr.sample_type; +u64 type = evsel->core.attr.sample_type;/* * missing:
@@ -1157,7 +1157,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)const char *name =perf_evsel__name (evsel);int ret; -pr ("Adding event '%s' (type %d)\n" , name, evsel->attr.type); +pr ("Adding event '%s' (type %d)\n" , name, evsel->core.attr.type); event_class =bt_ctf_event_class_create (name);if (!event_class)
@@ -1167,7 +1167,7 @@ static int add_event(struct ctf_writer *cw, struct evsel *evsel)if (ret) goto err; -if (evsel->attr.type ==PERF_TYPE_TRACEPOINT ) { +if (evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) { ret =add_tracepoint_types (cw, evsel, event_class);if (ret) goto err;
tools/perf/util/db-export.c +2 -2
@@ -388,8 +388,8 @@ int db_export__sample(struct db_export *dbe, union perf_event *event, } } -if ((evsel->attr.sample_type &PERF_SAMPLE_ADDR ) && -sample_addr_correlates_sym (&evsel->attr)) { +if ((evsel->core.attr.sample_type &PERF_SAMPLE_ADDR ) && +sample_addr_correlates_sym (&evsel->core.attr)) {struct addr_location addr_al;thread__resolve (thread, &addr_al, sample);
tools/perf/util/evlist.c +25 -25
172 lines not on this page · raw message
tools/perf/util/evsel.c +83 -84
383 lines not on this page · raw message
tools/perf/util/intel-pt.c +25 -25
50 lines not on this page · raw message
tools/perf/util/scripting-engines/trace-event-perl.c +3 -3
Lines of this file are not shown. View the raw message.
tools/perf/util/scripting-engines/trace-event-python.c +7 -7
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Jiri Olsa
reviewerPATCH 43/79 libperf: Add perf_cpu_map__new/perf_cpu_map__read functions
In reply to Jiri OlsaMoving following functions:
cpu_map__new
cpu_map__read
under libperf with following names:
perf_cpu_map__new
perf_cpu_map__read
--- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 3 +- tools/perf/bench/epoll-ctl.c | 3 +- tools/perf/bench/epoll-wait.c | 3 +- tools/perf/bench/futex-hash.c | 3 +- tools/perf/bench/futex-lock-pi.c | 3 +- tools/perf/bench/futex-requeue.c | 3 +- tools/perf/bench/futex-wake-parallel.c | 2 +- tools/perf/bench/futex-wake.c | 3 +- tools/perf/builtin-ftrace.c | 2 +- tools/perf/builtin-sched.c | 4 +- tools/perf/lib/cpumap.c | 184 +++++++++++++++++++ tools/perf/lib/include/internal/cpumap.h | 4 + tools/perf/lib/include/perf/cpumap.h | 3 + tools/perf/lib/libperf.map | 2 + tools/perf/tests/bitmap.c | 3 +- tools/perf/tests/code-reading.c | 5 +- tools/perf/tests/cpumap.c | 7 +- tools/perf/tests/event-times.c | 9 +- tools/perf/tests/event_update.c | 3 +- tools/perf/tests/keep-tracking.c | 3 +- tools/perf/tests/mem2node.c | 3 +- tools/perf/tests/mmap-basic.c | 3 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/switch-tracking.c | 5 +- tools/perf/tests/topology.c | 3 +- tools/perf/util/cpumap.c | 181 +----------------- tools/perf/util/cpumap.h | 2 - tools/perf/util/cputopo.c | 5 +- tools/perf/util/evlist.c | 5 +- tools/perf/util/header.c | 3 +- tools/perf/util/parse-events.c | 3 +- tools/perf/util/pmu.c | 3 +- tools/perf/util/python.c | 3 +- tools/perf/util/record.c | 7 +- tools/perf/util/session.c | 3 +- tools/perf/util/svghelper.c | 3 +- 36 files changed, 262 insertions(+), 224 deletions(-)
tools/perf/arch/x86/tests/perf-time-to-tsc.c +2 -1
@@ -5,6 +5,7 @@#include <unistd.h> #include <linux/types.h> #include <sys/prctl.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h"
@@ -65,7 +66,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe threads =thread_map__new (-1 ,getpid (),UINT_MAX );CHECK_NOT_NULL__ (threads); - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );CHECK_NOT_NULL__ (cpus); evlist =evlist__new ();
tools/perf/bench/epoll-ctl.c +2 -1
@@ -20,6 +20,7 @@#include <sys/resource.h> #include <sys/epoll.h> #include <sys/eventfd.h> +#include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h>
@@ -315,7 +316,7 @@ int bench_epoll_ctl(int argc, const char **argv) act.sa_sigaction = toggle_done;sigaction (SIGINT , &act,NULL ); - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu) goto errmem;
tools/perf/bench/epoll-wait.c +2 -1
@@ -75,6 +75,7 @@#include <sys/epoll.h> #include <sys/eventfd.h> #include <sys/types.h> +#include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h>
@@ -429,7 +430,7 @@ int bench_epoll_wait(int argc, const char **argv) act.sa_sigaction = toggle_done;sigaction (SIGINT , &act,NULL ); - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu) goto errmem;
tools/perf/bench/futex-hash.c +2 -1
@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include <sys/time.h> +#include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h>
@@ -132,7 +133,7 @@ int bench_futex_hash(int argc, const char **argv)exit (EXIT_FAILURE ); } - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu) goto errmem;
tools/perf/bench/futex-lock-pi.c +2 -1
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include <errno.h> +#include <perf/cpumap.h> #include "bench.h" #include "futex.h" #include "cpumap.h"
@@ -156,7 +157,7 @@ int bench_futex_lock_pi(int argc, const char **argv)if (argc) goto err; - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"calloc" );
tools/perf/bench/futex-requeue.c +2 -1
@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/time64.h> #include <errno.h> +#include <perf/cpumap.h> #include "bench.h" #include "futex.h" #include "cpumap.h"
@@ -123,7 +124,7 @@ int bench_futex_requeue(int argc, const char **argv)if (argc) goto err; - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"cpu_map__new" );
tools/perf/bench/futex-wake-parallel.c +1 -1
@@ -237,7 +237,7 @@ int bench_futex_wake_parallel(int argc, const char **argv) act.sa_sigaction = toggle_done;sigaction (SIGINT , &act,NULL ); - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"calloc" );
tools/perf/bench/futex-wake.c +2 -1
@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/time64.h> #include <errno.h> +#include <perf/cpumap.h> #include "bench.h" #include "futex.h" #include "cpumap.h"
@@ -131,7 +132,7 @@ int bench_futex_wake(int argc, const char **argv)exit (EXIT_FAILURE ); } - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"calloc" );
tools/perf/builtin-ftrace.c +1 -1
@@ -202,7 +202,7 @@ static int set_tracing_cpu(struct perf_ftrace *ftrace)static int reset_tracing_cpu (void ) { -struct perf_cpu_map *cpumap =cpu_map__new (NULL ); +struct perf_cpu_map *cpumap =perf_cpu_map__new (NULL );int ret; ret =set_tracing_cpumask (cpumap);
tools/perf/builtin-sched.c +2 -2
@@ -3183,7 +3183,7 @@ static int setup_map_cpus(struct perf_sched *sched)if (!sched->map.cpus_str)return 0 ; - map =cpu_map__new (sched->map.cpus_str); + map =perf_cpu_map__new (sched->map.cpus_str);if (!map) {pr_err ("failed to get cpus map from %s\n" , sched->map.cpus_str);return -1 ;
@@ -3217,7 +3217,7 @@ static int setup_color_cpus(struct perf_sched *sched)if (!sched->map.color_cpus_str)return 0 ; - map =cpu_map__new (sched->map.color_cpus_str); + map =perf_cpu_map__new (sched->map.color_cpus_str);if (!map) {pr_err ("failed to get thread map from %s\n" , sched->map.color_cpus_str);return -1 ;
tools/perf/lib/cpumap.c +184 -0
193 lines not on this page · raw message
tools/perf/lib/include/internal/cpumap.h +4 -0
@@ -10,4 +10,8 @@ struct perf_cpu_map { int map[]; }; +#ifndef MAX_NR_CPUS +#define MAX_NR_CPUS 2048 +#endif +#endif /* __LIBPERF_INTERNAL_CPUMAP_H */
tools/perf/lib/include/perf/cpumap.h +3 -0
@@ -3,10 +3,13 @@#define __LIBPERF_CPUMAP_H#include <perf/core.h> +#include <stdio.h> struct perf_cpu_map ; LIBPERF_API struct perf_cpu_map *perf_cpu_map__dummy_new(void); +LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); +LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file); LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map); LIBPERF_API void perf_cpu_map__put(struct perf_cpu_map *map);
tools/perf/lib/libperf.map +2 -0
@@ -4,6 +4,8 @@ LIBPERF_0.0.1 { perf_cpu_map__dummy_new; perf_cpu_map__get; perf_cpu_map__put; + perf_cpu_map__new; + perf_cpu_map__read; perf_thread_map__new_dummy; perf_thread_map__set_pid; perf_thread_map__comm;
tools/perf/tests/bitmap.c +2 -1
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> #include <linux/bitmap.h> +#include <perf/cpumap.h> #include "tests.h" #include "cpumap.h" #include "debug.h"
@@ -9,7 +10,7 @@static unsigned long *get_bitmap (const char *str,int nbits) { -struct perf_cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =perf_cpu_map__new (str);unsigned long *bm =NULL ;int i;
tools/perf/tests/code-reading.c +3 -2
@@ -8,6 +8,7 @@#include <stdio.h> #include <string.h> #include <sys/param.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h"
@@ -613,9 +614,9 @@ static int do_test_code_reading(bool try_kcore) goto out_put; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus) { -pr_debug ("cpu_map__new failed\n" ); +pr_debug ("perf_cpu_map__new failed\n" ); goto out_put; }
tools/perf/tests/cpumap.c +4 -3
@@ -5,6 +5,7 @@#include "event.h" #include <string.h> #include <linux/bitops.h> +#include <perf/cpumap.h> #include "debug.h" struct machine ;
@@ -78,7 +79,7 @@ int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __maystruct perf_cpu_map *cpus;/* This one is better stores in mask. */ - cpus =cpu_map__new ("0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19" ); + cpus =perf_cpu_map__new ("0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19" );TEST_ASSERT_VAL ("failed to synthesize map" , !perf_event__synthesize_cpu_map (NULL , cpus, process_event_mask,NULL ));
@@ -86,7 +87,7 @@ int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __mayperf_cpu_map__put (cpus);/* This one is better stores in cpu values. */ - cpus =cpu_map__new ("1,256" ); + cpus =perf_cpu_map__new ("1,256" );TEST_ASSERT_VAL ("failed to synthesize map" , !perf_event__synthesize_cpu_map (NULL , cpus, process_event_cpus,NULL ));
@@ -97,7 +98,7 @@ int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __maystatic int cpu_map_print (const char *str) { -struct perf_cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =perf_cpu_map__new (str);char buf[100 ];if (!map)
tools/perf/tests/event-times.c +5 -4
@@ -4,6 +4,7 @@#include <inttypes.h> #include <string.h> #include <sys/wait.h> +#include <perf/cpumap.h> #include "tests.h" #include "evlist.h" #include "evsel.h"
@@ -115,9 +116,9 @@ static int attach__cpu_disabled(struct evlist *evlist)pr_debug ("attaching to CPU 0 as enabled\n" ); - cpus =cpu_map__new ("0" ); + cpus =perf_cpu_map__new ("0" );if (cpus ==NULL ) { -pr_debug ("failed to call cpu_map__new\n" ); +pr_debug ("failed to call perf_cpu_map__new\n" );return -1 ; }
@@ -144,9 +145,9 @@ static int attach__cpu_enabled(struct evlist *evlist)pr_debug ("attaching to CPU 0 as enabled\n" ); - cpus =cpu_map__new ("0" ); + cpus =perf_cpu_map__new ("0" );if (cpus ==NULL ) { -pr_debug ("failed to call cpu_map__new\n" ); +pr_debug ("failed to call perf_cpu_map__new\n" );return -1 ; }
tools/perf/tests/event_update.c +2 -1
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h" #include "machine.h"
@@ -108,7 +109,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unuTEST_ASSERT_VAL ("failed to synthesize attr update name" , !perf_event__synthesize_event_update_name (&tmp.tool, evsel, process_event_name)); - evsel->own_cpus =cpu_map__new ("1,2,3" ); + evsel->own_cpus =perf_cpu_map__new ("1,2,3" );TEST_ASSERT_VAL ("failed to synthesize attr update cpus" , !perf_event__synthesize_event_update_cpus (&tmp.tool, evsel, process_event_cpus));
tools/perf/tests/keep-tracking.c +2 -1
@@ -2,6 +2,7 @@#include <linux/types.h> #include <unistd.h> #include <sys/prctl.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h"
@@ -75,7 +76,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un threads =thread_map__new (-1 ,getpid (),UINT_MAX );CHECK_NOT_NULL__ (threads); - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );CHECK_NOT_NULL__ (cpus); evlist =evlist__new ();
tools/perf/tests/mem2node.c +2 -1
@@ -2,6 +2,7 @@#include <linux/compiler.h> #include <linux/bitmap.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "cpumap.h" #include "mem2node.h" #include "tests.h"
@@ -19,7 +20,7 @@ static struct node {static unsigned long *get_bitmap (const char *str,int nbits) { -struct perf_cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =perf_cpu_map__new (str);unsigned long *bm =NULL ;int i;
tools/perf/tests/mmap-basic.c +2 -1
@@ -3,6 +3,7 @@#include <inttypes.h> /* For the CLR_() macros */ #include <pthread.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h"
@@ -46,7 +47,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unusereturn -1 ; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (cpus ==NULL ) {pr_debug ("cpu_map__new\n" ); goto out_free_threads;
tools/perf/tests/openat-syscall-all-cpus.c +1 -1
@@ -33,7 +33,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, intreturn -1 ; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (cpus ==NULL ) {pr_debug ("cpu_map__new\n" ); goto out_thread_map_delete;
tools/perf/tests/switch-tracking.c +3 -2
@@ -5,6 +5,7 @@#include <time.h> #include <stdlib.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h"
@@ -341,9 +342,9 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ goto out_err; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus) { -pr_debug ("cpu_map__new failed!\n" ); +pr_debug ("perf_cpu_map__new failed!\n" ); goto out_err; }
tools/perf/tests/topology.c +2 -1
@@ -2,6 +2,7 @@#include <string.h> #include <stdlib.h> #include <stdio.h> +#include <perf/cpumap.h> #include "tests.h" #include "util.h" #include "session.h"
@@ -126,7 +127,7 @@ int test__session_topology(struct test *test __maybe_unused, int subtest __maybeif (session_write_header (path)) goto free_path; - map =cpu_map__new (NULL ); + map =perf_cpu_map__new (NULL );if (map ==NULL ) {pr_debug ("failed to get system cpumap\n" ); goto free_path;
tools/perf/util/cpumap.c +1 -180
193 lines not on this page · raw message
tools/perf/util/cpumap.h +0 -2
@@ -11,10 +11,8 @@#include "perf.h" #include "util/debug.h" -struct perf_cpu_map *cpu_map__new (const char *cpu_list);struct perf_cpu_map *cpu_map__empty_new (int nr);struct perf_cpu_map *cpu_map__new_data (struct cpu_map_data *data); -struct perf_cpu_map *cpu_map__read (FILE *file);size_t cpu_map__snprint (struct perf_cpu_map *map,char *buf,size_t size);size_t cpu_map__snprint_mask (struct perf_cpu_map *map,char *buf,size_t size);size_t cpu_map__fprintf (struct perf_cpu_map *map,FILE *fp);
tools/perf/util/cputopo.c +3 -2
@@ -5,6 +5,7 @@#include <stdlib.h> #include <api/fs/fs.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "cputopo.h" #include "cpumap.h"
@@ -182,7 +183,7 @@ struct cpu_topology *cpu_topology__new(void) ncpus =cpu__max_present_cpu ();/* build online CPU map */ - map =cpu_map__new (NULL ); + map =perf_cpu_map__new (NULL );if (map ==NULL ) {pr_debug ("failed to get system cpumap\n" );return NULL ;
@@ -312,7 +313,7 @@ struct numa_topology *numa_topology__new(void)if (c) *c ='\0' ; - node_map =cpu_map__new (buf); + node_map =perf_cpu_map__new (buf);if (!node_map) goto out;
tools/perf/util/evlist.c +3 -2
@@ -34,6 +34,7 @@#include <linux/err.h> #include <linux/zalloc.h> #include <perf/evlist.h> +#include <perf/cpumap.h> #ifdef LACKS_SIGQUEUE_PROTOTYPE int sigqueue (pid_t pid,int sig,const union sigval value);
@@ -1089,7 +1090,7 @@ int perf_evlist__create_maps(struct evlist *evlist, struct target *target)if (target__uses_dummy_map (target)) cpus =perf_cpu_map__dummy_new ();else - cpus =cpu_map__new (target->cpu_list); + cpus =perf_cpu_map__new (target->cpu_list);if (!cpus) goto out_delete_threads;
@@ -1372,7 +1373,7 @@ static int perf_evlist__create_syswide_maps(struct evlist *evlist)* error, and we may not want to do that fallback to a * default cpu identity map :-\ */ - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus) goto out;
tools/perf/util/header.c +2 -1
@@ -20,6 +20,7 @@#include <linux/time64.h> #include <dirent.h> #include <bpf/libbpf.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h"
@@ -2348,7 +2349,7 @@ static int process_numa_topology(struct feat_fd *ff, void *data __maybe_unused)if (!str) goto error; - n->map =cpu_map__new (str); + n->map =perf_cpu_map__new (str);if (!n->map) goto error;
tools/perf/util/parse-events.c +2 -1
@@ -24,6 +24,7 @@#include "bpf-loader.h" #include "debug.h" #include <api/fs/tracing_path.h> +#include <perf/cpumap.h> #include "parse-events-bison.h" #define YY_EXTRA_TYPE int#include "parse-events-flex.h"
@@ -323,7 +324,7 @@ __add_event(struct list_head *list, int *idx, {struct evsel *evsel;struct perf_cpu_map *cpus = pmu ? pmu->cpus : - cpu_list ?cpu_map__new (cpu_list) :NULL ; + cpu_list ?perf_cpu_map__new (cpu_list) :NULL ;event_attr_init (attr);
tools/perf/util/pmu.c +2 -1
@@ -15,6 +15,7 @@#include <api/fs/fs.h> #include <locale.h> #include <regex.h> +#include <perf/cpumap.h> #include "pmu.h" #include "parse-events.h" #include "cpumap.h"
@@ -581,7 +582,7 @@ static struct perf_cpu_map *__pmu_cpumask(const char *path)if (!file)return NULL ; - cpus =cpu_map__read (file); + cpus =perf_cpu_map__read (file);fclose (file);return cpus; }
tools/perf/util/python.c +2 -1
@@ -4,6 +4,7 @@#include <inttypes.h> #include <poll.h> #include <linux/err.h> +#include <perf/cpumap.h> #include "evlist.h" #include "callchain.h" #include "evsel.h"
@@ -549,7 +550,7 @@ static int pyrf_cpu_map__init(struct pyrf_cpu_map *pcpus, kwlist, &cpustr))return -1 ; - pcpus->cpus =cpu_map__new (cpustr); + pcpus->cpus =perf_cpu_map__new (cpustr);if (pcpus->cpus ==NULL )return -1 ;return 0 ;
tools/perf/util/record.c +4 -3
@@ -6,6 +6,7 @@#include <errno.h> #include <api/fs/fs.h> #include <subcmd/parse-options.h> +#include <perf/cpumap.h> #include "util.h" #include "cloexec.h"
@@ -63,7 +64,7 @@ static bool perf_probe_api(setup_probe_fn_t fn)struct perf_cpu_map *cpus;int cpu, ret, i =0 ; - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus)return false; cpu = cpus->map[0 ];
@@ -118,7 +119,7 @@ bool perf_can_record_cpu_wide(void)struct perf_cpu_map *cpus;int cpu, fd; - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus)return false; cpu = cpus->map[0 ];
@@ -275,7 +276,7 @@ bool perf_evlist__can_select_event(struct evlist *evlist, const char *str) evsel =perf_evlist__last (temp_evlist);if (!evlist ||cpu_map__empty (evlist->cpus)) { -struct perf_cpu_map *cpus =cpu_map__new (NULL ); +struct perf_cpu_map *cpus =perf_cpu_map__new (NULL ); cpu = cpus ? cpus->map[0 ] :0 ;perf_cpu_map__put (cpus);
tools/perf/util/session.c +2 -1
@@ -10,6 +10,7 @@#include <unistd.h> #include <sys/types.h> #include <sys/mman.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h"
@@ -2289,7 +2290,7 @@ int perf_session__cpu_bitmap(struct perf_session *session, } } - map =cpu_map__new (cpu_list); + map =perf_cpu_map__new (cpu_list);if (map ==NULL ) {pr_err ("Invalid cpu_list\n" );return -1 ;
tools/perf/util/svghelper.c +2 -1
@@ -16,6 +16,7 @@#include <linux/bitmap.h> #include <linux/time64.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "perf.h" #include "svghelper.h"
@@ -731,7 +732,7 @@ static int str_to_bitmap(char *s, cpumask_t *b)struct perf_cpu_map *m;int c; - m =cpu_map__new (s); + m =perf_cpu_map__new (s);if (!m)return -1 ;
Signature · 1 line
2.21.0
Re: [PATCH 43/79] libperf: Add perf_cpu_map__new/perf_cpu_map__read functions
Em Sun, Jul 21, 2019 at 01:24:30PM +0200, Jiri Olsa escreveu:
Quoted 7 lines
Moving following functions:
cpu_map__new
cpu_map__readunder libperf with following names:
perf_cpu_map__new
perf_cpu_map__read
Fixed up this one:
tools/perf/arch/arm/util/cs-etm.c
Quoted 1,181 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 3 +- tools/perf/bench/epoll-ctl.c | 3 +- tools/perf/bench/epoll-wait.c | 3 +- tools/perf/bench/futex-hash.c | 3 +- tools/perf/bench/futex-lock-pi.c | 3 +- tools/perf/bench/futex-requeue.c | 3 +- tools/perf/bench/futex-wake-parallel.c | 2 +- tools/perf/bench/futex-wake.c | 3 +- tools/perf/builtin-ftrace.c | 2 +- tools/perf/builtin-sched.c | 4 +- tools/perf/lib/cpumap.c | 184 +++++++++++++++++++ tools/perf/lib/include/internal/cpumap.h | 4 + tools/perf/lib/include/perf/cpumap.h | 3 + tools/perf/lib/libperf.map | 2 + tools/perf/tests/bitmap.c | 3 +- tools/perf/tests/code-reading.c | 5 +- tools/perf/tests/cpumap.c | 7 +- tools/perf/tests/event-times.c | 9 +- tools/perf/tests/event_update.c | 3 +- tools/perf/tests/keep-tracking.c | 3 +- tools/perf/tests/mem2node.c | 3 +- tools/perf/tests/mmap-basic.c | 3 +- tools/perf/tests/openat-syscall-all-cpus.c | 2 +- tools/perf/tests/switch-tracking.c | 5 +- tools/perf/tests/topology.c | 3 +- tools/perf/util/cpumap.c | 181 +----------------- tools/perf/util/cpumap.h | 2 - tools/perf/util/cputopo.c | 5 +- tools/perf/util/evlist.c | 5 +- tools/perf/util/header.c | 3 +- tools/perf/util/parse-events.c | 3 +- tools/perf/util/pmu.c | 3 +- tools/perf/util/python.c | 3 +- tools/perf/util/record.c | 7 +- tools/perf/util/session.c | 3 +- tools/perf/util/svghelper.c | 3 +- 36 files changed, 262 insertions(+), 224 deletions(-)tools/perf/arch/x86/tests/perf-time-to-tsc.c +2
-1@@ -5,6 +5,7 @@#include <unistd.h> #include <linux/types.h> #include <sys/prctl.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h" @@ -65,7 +66,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe threads =thread_map__new (-1 ,getpid (),UINT_MAX );CHECK_NOT_NULL__ (threads); - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );CHECK_NOT_NULL__ (cpus); evlist =evlist__new ();tools/perf/bench/epoll-ctl.c +2
-1@@ -20,6 +20,7 @@#include <sys/resource.h> #include <sys/epoll.h> #include <sys/eventfd.h> +#include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h> @@ -315,7 +316,7 @@ int bench_epoll_ctl(int argc, const char **argv) act.sa_sigaction = toggle_done;sigaction (SIGINT , &act,NULL ); - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu) goto errmem;tools/perf/bench/epoll-wait.c +2
-1@@ -75,6 +75,7 @@#include <sys/epoll.h> #include <sys/eventfd.h> #include <sys/types.h> +#include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h> @@ -429,7 +430,7 @@ int bench_epoll_wait(int argc, const char **argv) act.sa_sigaction = toggle_done;sigaction (SIGINT , &act,NULL ); - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu) goto errmem;tools/perf/bench/futex-hash.c +2
-1@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include <sys/time.h> +#include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h> @@ -132,7 +133,7 @@ int bench_futex_hash(int argc, const char **argv)exit (EXIT_FAILURE ); } - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu) goto errmem;tools/perf/bench/futex-lock-pi.c +2
-1@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include <errno.h> +#include <perf/cpumap.h> #include "bench.h" #include "futex.h" #include "cpumap.h" @@ -156,7 +157,7 @@ int bench_futex_lock_pi(int argc, const char **argv)if (argc) goto err; - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"calloc" );tools/perf/bench/futex-requeue.c +2
-1@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/time64.h> #include <errno.h> +#include <perf/cpumap.h> #include "bench.h" #include "futex.h" #include "cpumap.h" @@ -123,7 +124,7 @@ int bench_futex_requeue(int argc, const char **argv)if (argc) goto err; - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"cpu_map__new" );tools/perf/bench/futex-wake-parallel.c +1
-1@@ -237,7 +237,7 @@ int bench_futex_wake_parallel(int argc, const char **argv) act.sa_sigaction = toggle_done;sigaction (SIGINT , &act,NULL ); - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"calloc" );tools/perf/bench/futex-wake.c +2
-1@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/time64.h> #include <errno.h> +#include <perf/cpumap.h> #include "bench.h" #include "futex.h" #include "cpumap.h" @@ -131,7 +132,7 @@ int bench_futex_wake(int argc, const char **argv)exit (EXIT_FAILURE ); } - cpu =cpu_map__new (NULL ); + cpu =perf_cpu_map__new (NULL );if (!cpu)err (EXIT_FAILURE ,"calloc" );tools/perf/builtin-ftrace.c +1
-1@@ -202,7 +202,7 @@ static int set_tracing_cpu(struct perf_ftrace *ftrace)static int reset_tracing_cpu (void ) { -struct perf_cpu_map *cpumap =cpu_map__new (NULL ); +struct perf_cpu_map *cpumap =perf_cpu_map__new (NULL );int ret; ret =set_tracing_cpumask (cpumap);tools/perf/builtin-sched.c +2
-2@@ -3183,7 +3183,7 @@ static int setup_map_cpus(struct perf_sched *sched)if (!sched->map.cpus_str)return 0 ; - map =cpu_map__new (sched->map.cpus_str); + map =perf_cpu_map__new (sched->map.cpus_str);if (!map) {pr_err ("failed to get cpus map from %s\n" , sched->map.cpus_str);return -1 ;@@ -3217,7 +3217,7 @@ static int setup_color_cpus(struct perf_sched *sched)if (!sched->map.color_cpus_str)return 0 ; - map =cpu_map__new (sched->map.color_cpus_str); + map =perf_cpu_map__new (sched->map.color_cpus_str);if (!map) {pr_err ("failed to get thread map from %s\n" , sched->map.color_cpus_str);return -1 ;tools/perf/lib/cpumap.c +184
-0@@ -5,6 +5,10 @@#include <internal/cpumap.h> #include <asm/bug.h> #include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <ctype.h> +#include <limits.h> struct perf_cpu_map *perf_cpu_map__dummy_new (void ) {@@ -40,3 +44,183 @@ void perf_cpu_map__put(struct perf_cpu_map *map)if (map &&refcount_dec_and_test (&map->refcnt))cpu_map__delete (map); } + +static struct perf_cpu_map *cpu_map__default_new (void ) +{ +struct perf_cpu_map *cpus; +int nr_cpus; + + nr_cpus =sysconf (_SC_NPROCESSORS_ONLN); +if (nr_cpus <0 ) +return NULL ; + + cpus =malloc (sizeof (*cpus) + nr_cpus *sizeof (int )); +if (cpus !=NULL ) { +int i; + +for (i =0 ; i < nr_cpus; ++i) + cpus->map[i] = i; + + cpus->nr = nr_cpus; +refcount_set (&cpus->refcnt,1 ); + } + +return cpus; +} + +static struct perf_cpu_map *cpu_map__trim_new (int nr_cpus,int *tmp_cpus) +{ +size_t payload_size = nr_cpus *sizeof (int ); +struct perf_cpu_map *cpus =malloc (sizeof (*cpus) + payload_size); + +if (cpus !=NULL ) { + cpus->nr = nr_cpus; +memcpy (cpus->map, tmp_cpus, payload_size); +refcount_set (&cpus->refcnt,1 ); + } + +return cpus; +} + +struct perf_cpu_map *perf_cpu_map__read (FILE *file) +{ +struct perf_cpu_map *cpus =NULL ; +int nr_cpus =0 ; +int *tmp_cpus =NULL , *tmp; +int max_entries =0 ; +int n, cpu, prev; +char sep; + + sep =0 ; + prev =-1 ; +for (;;) { + n =fscanf (file,"%u%c" , &cpu, &sep); +if (n <=0 ) +break ; +if (prev >=0 ) { +int new_max = nr_cpus + cpu - prev -1 ; + +if (new_max >= max_entries) { + max_entries = new_max +MAX_NR_CPUS /2 ; + tmp =realloc (tmp_cpus, max_entries *sizeof (int )); +if (tmp ==NULL ) + goto out_free_tmp; + tmp_cpus = tmp; + } + +while (++prev < cpu) + tmp_cpus[nr_cpus++] = prev; + } +if (nr_cpus == max_entries) { + max_entries +=MAX_NR_CPUS ; + tmp =realloc (tmp_cpus, max_entries *sizeof (int )); +if (tmp ==NULL ) + goto out_free_tmp; + tmp_cpus = tmp; + } + + tmp_cpus[nr_cpus++] = cpu; +if (n ==2 && sep =='-' ) + prev = cpu; +else + prev =-1 ; +if (n ==1 || sep =='\n' ) +break ; + } + +if (nr_cpus >0 ) + cpus =cpu_map__trim_new (nr_cpus, tmp_cpus); +else + cpus =cpu_map__default_new (); +out_free_tmp: +free (tmp_cpus); +return cpus; +} + +static struct perf_cpu_map *cpu_map__read_all_cpu_map (void ) +{ +struct perf_cpu_map *cpus =NULL ; +FILE *onlnf; + + onlnf =fopen ("/sys/devices/system/cpu/online" ,"r" ); +if (!onlnf) +return cpu_map__default_new (); + + cpus =perf_cpu_map__read (onlnf); +fclose (onlnf); +return cpus; +} + +struct perf_cpu_map *perf_cpu_map__new (const char *cpu_list) +{ +struct perf_cpu_map *cpus =NULL ; +unsigned long start_cpu, end_cpu =0 ; +char *p =NULL ; +int i, nr_cpus =0 ; +int *tmp_cpus =NULL , *tmp; +int max_entries =0 ; + +if (!cpu_list) +return cpu_map__read_all_cpu_map (); + +/* +* must handle the case of empty cpumap to cover +* TOPOLOGY header for NUMA nodes with no CPU +* ( e.g., because of CPU hotplug) +*/ +if (!isdigit (*cpu_list) && *cpu_list !='\0' ) + goto out; + +while (isdigit (*cpu_list)) { + p =NULL ; + start_cpu =strtoul (cpu_list, &p,0 ); +if (start_cpu >=INT_MAX + || (*p !='\0' && *p !=',' && *p !='-' )) + goto invalid; + +if (*p =='-' ) { + cpu_list = ++p; + p =NULL ; + end_cpu =strtoul (cpu_list, &p,0 ); + +if (end_cpu >=INT_MAX || (*p !='\0' && *p !=',' )) + goto invalid; + +if (end_cpu < start_cpu) + goto invalid; + }else { + end_cpu = start_cpu; + } + +for (; start_cpu <= end_cpu; start_cpu++) { +/* check for duplicates */ +for (i =0 ; i < nr_cpus; i++) +if (tmp_cpus[i] == (int )start_cpu) + goto invalid; + +if (nr_cpus == max_entries) { + max_entries +=MAX_NR_CPUS ; + tmp =realloc (tmp_cpus, max_entries *sizeof (int )); +if (tmp ==NULL ) + goto invalid; + tmp_cpus = tmp; + } + tmp_cpus[nr_cpus++] = (int )start_cpu; + } +if (*p) + ++p; + + cpu_list = p; + } + +if (nr_cpus >0 ) + cpus =cpu_map__trim_new (nr_cpus, tmp_cpus); +else if (*cpu_list !='\0' ) + cpus =cpu_map__default_new (); +else + cpus =perf_cpu_map__dummy_new (); +invalid: +free (tmp_cpus); +out: +return cpus; +}tools/perf/lib/include/internal/cpumap.h +4
-0@@ -10,4 +10,8 @@ struct perf_cpu_map { int map[]; }; +#ifndef MAX_NR_CPUS +#define MAX_NR_CPUS 2048 +#endif +#endif /* __LIBPERF_INTERNAL_CPUMAP_H */ tools/perf/lib/include/perf/cpumap.h +3
-0@@ -3,10 +3,13 @@#define __LIBPERF_CPUMAP_H#include <perf/core.h> +#include <stdio.h> struct perf_cpu_map ; LIBPERF_API struct perf_cpu_map *perf_cpu_map__dummy_new(void); +LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); +LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file); LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map); LIBPERF_API void perf_cpu_map__put(struct perf_cpu_map *map);tools/perf/lib/libperf.map +2
-0@@ -4,6 +4,8 @@ LIBPERF_0.0.1 { perf_cpu_map__dummy_new; perf_cpu_map__get; perf_cpu_map__put; + perf_cpu_map__new; + perf_cpu_map__read; perf_thread_map__new_dummy; perf_thread_map__set_pid; perf_thread_map__comm;tools/perf/tests/bitmap.c +2
-1@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> #include <linux/bitmap.h> +#include <perf/cpumap.h> #include "tests.h" #include "cpumap.h" #include "debug.h" @@ -9,7 +10,7 @@static unsigned long *get_bitmap (const char *str,int nbits) { -struct perf_cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =perf_cpu_map__new (str);unsigned long *bm =NULL ;int i;tools/perf/tests/code-reading.c +3
-2@@ -8,6 +8,7 @@#include <stdio.h> #include <string.h> #include <sys/param.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h" @@ -613,9 +614,9 @@ static int do_test_code_reading(bool try_kcore) goto out_put; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus) { -pr_debug ("cpu_map__new failed\n" ); +pr_debug ("perf_cpu_map__new failed\n" ); goto out_put; }tools/perf/tests/cpumap.c +4
-3@@ -5,6 +5,7 @@#include "event.h" #include <string.h> #include <linux/bitops.h> +#include <perf/cpumap.h> #include "debug.h" struct machine ;@@ -78,7 +79,7 @@ int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __maystruct perf_cpu_map *cpus;/* This one is better stores in mask. */ - cpus =cpu_map__new ("0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19" ); + cpus =perf_cpu_map__new ("0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19" );TEST_ASSERT_VAL ("failed to synthesize map" , !perf_event__synthesize_cpu_map (NULL , cpus, process_event_mask,NULL ));@@ -86,7 +87,7 @@ int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __mayperf_cpu_map__put (cpus);/* This one is better stores in cpu values. */ - cpus =cpu_map__new ("1,256" ); + cpus =perf_cpu_map__new ("1,256" );TEST_ASSERT_VAL ("failed to synthesize map" , !perf_event__synthesize_cpu_map (NULL , cpus, process_event_cpus,NULL ));@@ -97,7 +98,7 @@ int test__cpu_map_synthesize(struct test *test __maybe_unused, int subtest __maystatic int cpu_map_print (const char *str) { -struct perf_cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =perf_cpu_map__new (str);char buf[100 ];if (!map)tools/perf/tests/event-times.c +5
-4@@ -4,6 +4,7 @@#include <inttypes.h> #include <string.h> #include <sys/wait.h> +#include <perf/cpumap.h> #include "tests.h" #include "evlist.h" #include "evsel.h" @@ -115,9 +116,9 @@ static int attach__cpu_disabled(struct evlist *evlist)pr_debug ("attaching to CPU 0 as enabled\n" ); - cpus =cpu_map__new ("0" ); + cpus =perf_cpu_map__new ("0" );if (cpus ==NULL ) { -pr_debug ("failed to call cpu_map__new\n" ); +pr_debug ("failed to call perf_cpu_map__new\n" );return -1 ; }@@ -144,9 +145,9 @@ static int attach__cpu_enabled(struct evlist *evlist)pr_debug ("attaching to CPU 0 as enabled\n" ); - cpus =cpu_map__new ("0" ); + cpus =perf_cpu_map__new ("0" );if (cpus ==NULL ) { -pr_debug ("failed to call cpu_map__new\n" ); +pr_debug ("failed to call perf_cpu_map__new\n" );return -1 ; }tools/perf/tests/event_update.c +2
-1@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h" #include "machine.h" @@ -108,7 +109,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unuTEST_ASSERT_VAL ("failed to synthesize attr update name" , !perf_event__synthesize_event_update_name (&tmp.tool, evsel, process_event_name)); - evsel->own_cpus =cpu_map__new ("1,2,3" ); + evsel->own_cpus =perf_cpu_map__new ("1,2,3" );TEST_ASSERT_VAL ("failed to synthesize attr update cpus" , !perf_event__synthesize_event_update_cpus (&tmp.tool, evsel, process_event_cpus));tools/perf/tests/keep-tracking.c +2
-1@@ -2,6 +2,7 @@#include <linux/types.h> #include <unistd.h> #include <sys/prctl.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h" @@ -75,7 +76,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un threads =thread_map__new (-1 ,getpid (),UINT_MAX );CHECK_NOT_NULL__ (threads); - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );CHECK_NOT_NULL__ (cpus); evlist =evlist__new ();tools/perf/tests/mem2node.c +2
-1@@ -2,6 +2,7 @@#include <linux/compiler.h> #include <linux/bitmap.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "cpumap.h" #include "mem2node.h" #include "tests.h" @@ -19,7 +20,7 @@ static struct node {static unsigned long *get_bitmap (const char *str,int nbits) { -struct perf_cpu_map *map =cpu_map__new (str); +struct perf_cpu_map *map =perf_cpu_map__new (str);unsigned long *bm =NULL ;int i;tools/perf/tests/mmap-basic.c +2
-1@@ -3,6 +3,7 @@#include <inttypes.h> /* For the CLR_() macros */ #include <pthread.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h" @@ -46,7 +47,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unusereturn -1 ; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (cpus ==NULL ) {pr_debug ("cpu_map__new\n" ); goto out_free_threads;tools/perf/tests/openat-syscall-all-cpus.c +1
-1@@ -33,7 +33,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, intreturn -1 ; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (cpus ==NULL ) {pr_debug ("cpu_map__new\n" ); goto out_thread_map_delete;tools/perf/tests/switch-tracking.c +3
-2@@ -5,6 +5,7 @@#include <time.h> #include <stdlib.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "parse-events.h" #include "evlist.h" @@ -341,9 +342,9 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ goto out_err; } - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus) { -pr_debug ("cpu_map__new failed!\n" ); +pr_debug ("perf_cpu_map__new failed!\n" ); goto out_err; }tools/perf/tests/topology.c +2
-1@@ -2,6 +2,7 @@#include <string.h> #include <stdlib.h> #include <stdio.h> +#include <perf/cpumap.h> #include "tests.h" #include "util.h" #include "session.h" @@ -126,7 +127,7 @@ int test__session_topology(struct test *test __maybe_unused, int subtest __maybeif (session_write_header (path)) goto free_path; - map =cpu_map__new (NULL ); + map =perf_cpu_map__new (NULL );if (map ==NULL ) {pr_debug ("failed to get system cpumap\n" ); goto free_path;tools/perf/util/cpumap.c +1
-180@@ -17,185 +17,6 @@ static int max_present_cpu_num;static int max_node_num;static int *cpunode_map; -static struct perf_cpu_map *cpu_map__default_new (void ) -{ -struct perf_cpu_map *cpus; -int nr_cpus; - - nr_cpus =sysconf (_SC_NPROCESSORS_ONLN); -if (nr_cpus <0 ) -return NULL ; - - cpus =malloc (sizeof (*cpus) + nr_cpus *sizeof (int )); -if (cpus !=NULL ) { -int i; -for (i =0 ; i < nr_cpus; ++i) - cpus->map[i] = i; - - cpus->nr = nr_cpus; -refcount_set (&cpus->refcnt,1 ); - } - -return cpus; -} - -static struct perf_cpu_map *cpu_map__trim_new (int nr_cpus,int *tmp_cpus) -{ -size_t payload_size = nr_cpus *sizeof (int ); -struct perf_cpu_map *cpus =malloc (sizeof (*cpus) + payload_size); - -if (cpus !=NULL ) { - cpus->nr = nr_cpus; -memcpy (cpus->map, tmp_cpus, payload_size); -refcount_set (&cpus->refcnt,1 ); - } - -return cpus; -} - -struct perf_cpu_map *cpu_map__read (FILE *file) -{ -struct perf_cpu_map *cpus =NULL ; -int nr_cpus =0 ; -int *tmp_cpus =NULL , *tmp; -int max_entries =0 ; -int n, cpu, prev; -char sep; - - sep =0 ; - prev =-1 ; -for (;;) { - n =fscanf (file,"%u%c" , &cpu, &sep); -if (n <=0 ) -break ; -if (prev >=0 ) { -int new_max = nr_cpus + cpu - prev -1 ; - -if (new_max >= max_entries) { - max_entries = new_max +MAX_NR_CPUS /2 ; - tmp =realloc (tmp_cpus, max_entries *sizeof (int )); -if (tmp ==NULL ) - goto out_free_tmp; - tmp_cpus = tmp; - } - -while (++prev < cpu) - tmp_cpus[nr_cpus++] = prev; - } -if (nr_cpus == max_entries) { - max_entries +=MAX_NR_CPUS ; - tmp =realloc (tmp_cpus, max_entries *sizeof (int )); -if (tmp ==NULL ) - goto out_free_tmp; - tmp_cpus = tmp; - } - - tmp_cpus[nr_cpus++] = cpu; -if (n ==2 && sep =='-' ) - prev = cpu; -else - prev =-1 ; -if (n ==1 || sep =='\n' ) -break ; - } - -if (nr_cpus >0 ) - cpus =cpu_map__trim_new (nr_cpus, tmp_cpus); -else - cpus =cpu_map__default_new (); -out_free_tmp: -free (tmp_cpus); -return cpus; -} - -static struct perf_cpu_map *cpu_map__read_all_cpu_map (void ) -{ -struct perf_cpu_map *cpus =NULL ; -FILE *onlnf; - - onlnf =fopen ("/sys/devices/system/cpu/online" ,"r" ); -if (!onlnf) -return cpu_map__default_new (); - - cpus =cpu_map__read (onlnf); -fclose (onlnf); -return cpus; -} - -struct perf_cpu_map *cpu_map__new (const char *cpu_list) -{ -struct perf_cpu_map *cpus =NULL ; -unsigned long start_cpu, end_cpu =0 ; -char *p =NULL ; -int i, nr_cpus =0 ; -int *tmp_cpus =NULL , *tmp; -int max_entries =0 ; - -if (!cpu_list) -return cpu_map__read_all_cpu_map (); - -/* -* must handle the case of empty cpumap to cover -* TOPOLOGY header for NUMA nodes with no CPU -* ( e.g., because of CPU hotplug) -*/ -if (!isdigit (*cpu_list) && *cpu_list !='\0' ) - goto out; - -while (isdigit (*cpu_list)) { - p =NULL ; - start_cpu =strtoul (cpu_list, &p,0 ); -if (start_cpu >=INT_MAX - || (*p !='\0' && *p !=',' && *p !='-' )) - goto invalid; - -if (*p =='-' ) { - cpu_list = ++p; - p =NULL ; - end_cpu =strtoul (cpu_list, &p,0 ); - -if (end_cpu >=INT_MAX || (*p !='\0' && *p !=',' )) - goto invalid; - -if (end_cpu < start_cpu) - goto invalid; - }else { - end_cpu = start_cpu; - } - -for (; start_cpu <= end_cpu; start_cpu++) { -/* check for duplicates */ -for (i =0 ; i < nr_cpus; i++) -if (tmp_cpus[i] == (int )start_cpu) - goto invalid; - -if (nr_cpus == max_entries) { - max_entries +=MAX_NR_CPUS ; - tmp =realloc (tmp_cpus, max_entries *sizeof (int )); -if (tmp ==NULL ) - goto invalid; - tmp_cpus = tmp; - } - tmp_cpus[nr_cpus++] = (int )start_cpu; - } -if (*p) - ++p; - - cpu_list = p; - } - -if (nr_cpus >0 ) - cpus =cpu_map__trim_new (nr_cpus, tmp_cpus); -else if (*cpu_list !='\0' ) - cpus =cpu_map__default_new (); -else - cpus =perf_cpu_map__dummy_new (); -invalid: -free (tmp_cpus); -out: -return cpus; -} -static struct perf_cpu_map *cpu_map__from_entries (struct cpu_map_entries *cpus) {struct perf_cpu_map *map;@@ -751,7 +572,7 @@ const struct perf_cpu_map *cpu_map__online(void) /* thread unsafe */static const struct perf_cpu_map *online =NULL ;if (!online) - online =cpu_map__new (NULL );/* from /sys/devices/system/cpu/online */ + online =perf_cpu_map__new (NULL );/* from /sys/devices/system/cpu/online */ return online; }tools/perf/util/cpumap.h +0
-2@@ -11,10 +11,8 @@#include "perf.h" #include "util/debug.h" -struct perf_cpu_map *cpu_map__new (const char *cpu_list);struct perf_cpu_map *cpu_map__empty_new (int nr);struct perf_cpu_map *cpu_map__new_data (struct cpu_map_data *data); -struct perf_cpu_map *cpu_map__read (FILE *file);size_t cpu_map__snprint (struct perf_cpu_map *map,char *buf,size_t size);size_t cpu_map__snprint_mask (struct perf_cpu_map *map,char *buf,size_t size);size_t cpu_map__fprintf (struct perf_cpu_map *map,FILE *fp);tools/perf/util/cputopo.c +3
-2@@ -5,6 +5,7 @@#include <stdlib.h> #include <api/fs/fs.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "cputopo.h" #include "cpumap.h" @@ -182,7 +183,7 @@ struct cpu_topology *cpu_topology__new(void) ncpus =cpu__max_present_cpu ();/* build online CPU map */ - map =cpu_map__new (NULL ); + map =perf_cpu_map__new (NULL );if (map ==NULL ) {pr_debug ("failed to get system cpumap\n" );return NULL ;@@ -312,7 +313,7 @@ struct numa_topology *numa_topology__new(void)if (c) *c ='\0' ; - node_map =cpu_map__new (buf); + node_map =perf_cpu_map__new (buf);if (!node_map) goto out;tools/perf/util/evlist.c +3
-2@@ -34,6 +34,7 @@#include <linux/err.h> #include <linux/zalloc.h> #include <perf/evlist.h> +#include <perf/cpumap.h> #ifdef LACKS_SIGQUEUE_PROTOTYPE int sigqueue (pid_t pid,int sig,const union sigval value);@@ -1089,7 +1090,7 @@ int perf_evlist__create_maps(struct evlist *evlist, struct target *target)if (target__uses_dummy_map (target)) cpus =perf_cpu_map__dummy_new ();else - cpus =cpu_map__new (target->cpu_list); + cpus =perf_cpu_map__new (target->cpu_list);if (!cpus) goto out_delete_threads;@@ -1372,7 +1373,7 @@ static int perf_evlist__create_syswide_maps(struct evlist *evlist)* error, and we may not want to do that fallback to a * default cpu identity map :-\ */ - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus) goto out;tools/perf/util/header.c +2
-1@@ -20,6 +20,7 @@#include <linux/time64.h> #include <dirent.h> #include <bpf/libbpf.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h" @@ -2348,7 +2349,7 @@ static int process_numa_topology(struct feat_fd *ff, void *data __maybe_unused)if (!str) goto error; - n->map =cpu_map__new (str); + n->map =perf_cpu_map__new (str);if (!n->map) goto error;tools/perf/util/parse-events.c +2
-1@@ -24,6 +24,7 @@#include "bpf-loader.h" #include "debug.h" #include <api/fs/tracing_path.h> +#include <perf/cpumap.h> #include "parse-events-bison.h" #define YY_EXTRA_TYPE int#include "parse-events-flex.h" @@ -323,7 +324,7 @@ __add_event(struct list_head *list, int *idx, {struct evsel *evsel;struct perf_cpu_map *cpus = pmu ? pmu->cpus : - cpu_list ?cpu_map__new (cpu_list) :NULL ; + cpu_list ?perf_cpu_map__new (cpu_list) :NULL ;event_attr_init (attr);tools/perf/util/pmu.c +2
-1@@ -15,6 +15,7 @@#include <api/fs/fs.h> #include <locale.h> #include <regex.h> +#include <perf/cpumap.h> #include "pmu.h" #include "parse-events.h" #include "cpumap.h" @@ -581,7 +582,7 @@ static struct perf_cpu_map *__pmu_cpumask(const char *path)if (!file)return NULL ; - cpus =cpu_map__read (file); + cpus =perf_cpu_map__read (file);fclose (file);return cpus; }tools/perf/util/python.c +2
-1@@ -4,6 +4,7 @@#include <inttypes.h> #include <poll.h> #include <linux/err.h> +#include <perf/cpumap.h> #include "evlist.h" #include "callchain.h" #include "evsel.h" @@ -549,7 +550,7 @@ static int pyrf_cpu_map__init(struct pyrf_cpu_map *pcpus, kwlist, &cpustr))return -1 ; - pcpus->cpus =cpu_map__new (cpustr); + pcpus->cpus =perf_cpu_map__new (cpustr);if (pcpus->cpus ==NULL )return -1 ;return 0 ;tools/perf/util/record.c +4
-3@@ -6,6 +6,7 @@#include <errno.h> #include <api/fs/fs.h> #include <subcmd/parse-options.h> +#include <perf/cpumap.h> #include "util.h" #include "cloexec.h" @@ -63,7 +64,7 @@ static bool perf_probe_api(setup_probe_fn_t fn)struct perf_cpu_map *cpus;int cpu, ret, i =0 ; - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus)return false; cpu = cpus->map[0 ];@@ -118,7 +119,7 @@ bool perf_can_record_cpu_wide(void)struct perf_cpu_map *cpus;int cpu, fd; - cpus =cpu_map__new (NULL ); + cpus =perf_cpu_map__new (NULL );if (!cpus)return false; cpu = cpus->map[0 ];@@ -275,7 +276,7 @@ bool perf_evlist__can_select_event(struct evlist *evlist, const char *str) evsel =perf_evlist__last (temp_evlist);if (!evlist ||cpu_map__empty (evlist->cpus)) { -struct perf_cpu_map *cpus =cpu_map__new (NULL ); +struct perf_cpu_map *cpus =perf_cpu_map__new (NULL ); cpu = cpus ? cpus->map[0 ] :0 ;perf_cpu_map__put (cpus);tools/perf/util/session.c +2
-1@@ -10,6 +10,7 @@#include <unistd.h> #include <sys/types.h> #include <sys/mman.h> +#include <perf/cpumap.h> #include "evlist.h" #include "evsel.h" @@ -2289,7 +2290,7 @@ int perf_session__cpu_bitmap(struct perf_session *session, } } - map =cpu_map__new (cpu_list); + map =perf_cpu_map__new (cpu_list);if (map ==NULL ) {pr_err ("Invalid cpu_list\n" );return -1 ;tools/perf/util/svghelper.c +2
-1@@ -16,6 +16,7 @@#include <linux/bitmap.h> #include <linux/time64.h> #include <linux/zalloc.h> +#include <perf/cpumap.h> #include "perf.h" #include "svghelper.h" @@ -731,7 +732,7 @@ static int str_to_bitmap(char *s, cpumask_t *b)struct perf_cpu_map *m;int c; - m =cpu_map__new (s); + m =perf_cpu_map__new (s);if (!m)return -1 ;Signature · 1 line
2.21.0
Signature · 1 line
- Arnaldo