diff options
Diffstat (limited to 'tools/perf/tests')
-rw-r--r-- | tools/perf/tests/builtin-test.c | 18 | ||||
-rw-r--r-- | tools/perf/tests/fdarray.c | 174 | ||||
-rw-r--r-- | tools/perf/tests/mmap-basic.c | 7 | ||||
-rw-r--r-- | tools/perf/tests/open-syscall-all-cpus.c | 5 | ||||
-rw-r--r-- | tools/perf/tests/open-syscall-tp-fields.c | 9 | ||||
-rw-r--r-- | tools/perf/tests/open-syscall.c | 3 | ||||
-rw-r--r-- | tools/perf/tests/perf-record.c | 15 | ||||
-rw-r--r-- | tools/perf/tests/pmu.c | 2 | ||||
-rw-r--r-- | tools/perf/tests/rdpmc.c | 6 | ||||
-rw-r--r-- | tools/perf/tests/sw-clock.c | 6 | ||||
-rw-r--r-- | tools/perf/tests/switch-tracking.c | 572 | ||||
-rw-r--r-- | tools/perf/tests/task-exit.c | 8 | ||||
-rw-r--r-- | tools/perf/tests/tests.h | 3 |
13 files changed, 804 insertions, 24 deletions
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 6f8b01bc6033..ac655b0700e7 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c | |||
@@ -154,6 +154,18 @@ static struct test { | |||
154 | .func = test__hists_cumulate, | 154 | .func = test__hists_cumulate, |
155 | }, | 155 | }, |
156 | { | 156 | { |
157 | .desc = "Test tracking with sched_switch", | ||
158 | .func = test__switch_tracking, | ||
159 | }, | ||
160 | { | ||
161 | .desc = "Filter fds with revents mask in a fdarray", | ||
162 | .func = test__fdarray__filter, | ||
163 | }, | ||
164 | { | ||
165 | .desc = "Add fd to a fdarray, making it autogrow", | ||
166 | .func = test__fdarray__add, | ||
167 | }, | ||
168 | { | ||
157 | .func = NULL, | 169 | .func = NULL, |
158 | }, | 170 | }, |
159 | }; | 171 | }; |
@@ -185,9 +197,11 @@ static bool perf_test__matches(int curr, int argc, const char *argv[]) | |||
185 | static int run_test(struct test *test) | 197 | static int run_test(struct test *test) |
186 | { | 198 | { |
187 | int status, err = -1, child = fork(); | 199 | int status, err = -1, child = fork(); |
200 | char sbuf[STRERR_BUFSIZE]; | ||
188 | 201 | ||
189 | if (child < 0) { | 202 | if (child < 0) { |
190 | pr_err("failed to fork test: %s\n", strerror(errno)); | 203 | pr_err("failed to fork test: %s\n", |
204 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
191 | return -1; | 205 | return -1; |
192 | } | 206 | } |
193 | 207 | ||
@@ -297,7 +311,7 @@ int cmd_test(int argc, const char **argv, const char *prefix __maybe_unused) | |||
297 | symbol_conf.sort_by_name = true; | 311 | symbol_conf.sort_by_name = true; |
298 | symbol_conf.try_vmlinux_path = true; | 312 | symbol_conf.try_vmlinux_path = true; |
299 | 313 | ||
300 | if (symbol__init() < 0) | 314 | if (symbol__init(NULL) < 0) |
301 | return -1; | 315 | return -1; |
302 | 316 | ||
303 | if (skip != NULL) | 317 | if (skip != NULL) |
diff --git a/tools/perf/tests/fdarray.c b/tools/perf/tests/fdarray.c new file mode 100644 index 000000000000..d24b837951d4 --- /dev/null +++ b/tools/perf/tests/fdarray.c | |||
@@ -0,0 +1,174 @@ | |||
1 | #include <api/fd/array.h> | ||
2 | #include "util/debug.h" | ||
3 | #include "tests/tests.h" | ||
4 | |||
5 | static void fdarray__init_revents(struct fdarray *fda, short revents) | ||
6 | { | ||
7 | int fd; | ||
8 | |||
9 | fda->nr = fda->nr_alloc; | ||
10 | |||
11 | for (fd = 0; fd < fda->nr; ++fd) { | ||
12 | fda->entries[fd].fd = fda->nr - fd; | ||
13 | fda->entries[fd].revents = revents; | ||
14 | } | ||
15 | } | ||
16 | |||
17 | static int fdarray__fprintf_prefix(struct fdarray *fda, const char *prefix, FILE *fp) | ||
18 | { | ||
19 | int printed = 0; | ||
20 | |||
21 | if (!verbose) | ||
22 | return 0; | ||
23 | |||
24 | printed += fprintf(fp, "\n%s: ", prefix); | ||
25 | return printed + fdarray__fprintf(fda, fp); | ||
26 | } | ||
27 | |||
28 | int test__fdarray__filter(void) | ||
29 | { | ||
30 | int nr_fds, expected_fd[2], fd, err = TEST_FAIL; | ||
31 | struct fdarray *fda = fdarray__new(5, 5); | ||
32 | |||
33 | if (fda == NULL) { | ||
34 | pr_debug("\nfdarray__new() failed!"); | ||
35 | goto out; | ||
36 | } | ||
37 | |||
38 | fdarray__init_revents(fda, POLLIN); | ||
39 | nr_fds = fdarray__filter(fda, POLLHUP, NULL); | ||
40 | if (nr_fds != fda->nr_alloc) { | ||
41 | pr_debug("\nfdarray__filter()=%d != %d shouldn't have filtered anything", | ||
42 | nr_fds, fda->nr_alloc); | ||
43 | goto out_delete; | ||
44 | } | ||
45 | |||
46 | fdarray__init_revents(fda, POLLHUP); | ||
47 | nr_fds = fdarray__filter(fda, POLLHUP, NULL); | ||
48 | if (nr_fds != 0) { | ||
49 | pr_debug("\nfdarray__filter()=%d != %d, should have filtered all fds", | ||
50 | nr_fds, fda->nr_alloc); | ||
51 | goto out_delete; | ||
52 | } | ||
53 | |||
54 | fdarray__init_revents(fda, POLLHUP); | ||
55 | fda->entries[2].revents = POLLIN; | ||
56 | expected_fd[0] = fda->entries[2].fd; | ||
57 | |||
58 | pr_debug("\nfiltering all but fda->entries[2]:"); | ||
59 | fdarray__fprintf_prefix(fda, "before", stderr); | ||
60 | nr_fds = fdarray__filter(fda, POLLHUP, NULL); | ||
61 | fdarray__fprintf_prefix(fda, " after", stderr); | ||
62 | if (nr_fds != 1) { | ||
63 | pr_debug("\nfdarray__filter()=%d != 1, should have left just one event", nr_fds); | ||
64 | goto out_delete; | ||
65 | } | ||
66 | |||
67 | if (fda->entries[0].fd != expected_fd[0]) { | ||
68 | pr_debug("\nfda->entries[0].fd=%d != %d\n", | ||
69 | fda->entries[0].fd, expected_fd[0]); | ||
70 | goto out_delete; | ||
71 | } | ||
72 | |||
73 | fdarray__init_revents(fda, POLLHUP); | ||
74 | fda->entries[0].revents = POLLIN; | ||
75 | expected_fd[0] = fda->entries[0].fd; | ||
76 | fda->entries[3].revents = POLLIN; | ||
77 | expected_fd[1] = fda->entries[3].fd; | ||
78 | |||
79 | pr_debug("\nfiltering all but (fda->entries[0], fda->entries[3]):"); | ||
80 | fdarray__fprintf_prefix(fda, "before", stderr); | ||
81 | nr_fds = fdarray__filter(fda, POLLHUP, NULL); | ||
82 | fdarray__fprintf_prefix(fda, " after", stderr); | ||
83 | if (nr_fds != 2) { | ||
84 | pr_debug("\nfdarray__filter()=%d != 2, should have left just two events", | ||
85 | nr_fds); | ||
86 | goto out_delete; | ||
87 | } | ||
88 | |||
89 | for (fd = 0; fd < 2; ++fd) { | ||
90 | if (fda->entries[fd].fd != expected_fd[fd]) { | ||
91 | pr_debug("\nfda->entries[%d].fd=%d != %d\n", fd, | ||
92 | fda->entries[fd].fd, expected_fd[fd]); | ||
93 | goto out_delete; | ||
94 | } | ||
95 | } | ||
96 | |||
97 | pr_debug("\n"); | ||
98 | |||
99 | err = 0; | ||
100 | out_delete: | ||
101 | fdarray__delete(fda); | ||
102 | out: | ||
103 | return err; | ||
104 | } | ||
105 | |||
106 | int test__fdarray__add(void) | ||
107 | { | ||
108 | int err = TEST_FAIL; | ||
109 | struct fdarray *fda = fdarray__new(2, 2); | ||
110 | |||
111 | if (fda == NULL) { | ||
112 | pr_debug("\nfdarray__new() failed!"); | ||
113 | goto out; | ||
114 | } | ||
115 | |||
116 | #define FDA_CHECK(_idx, _fd, _revents) \ | ||
117 | if (fda->entries[_idx].fd != _fd) { \ | ||
118 | pr_debug("\n%d: fda->entries[%d](%d) != %d!", \ | ||
119 | __LINE__, _idx, fda->entries[1].fd, _fd); \ | ||
120 | goto out_delete; \ | ||
121 | } \ | ||
122 | if (fda->entries[_idx].events != (_revents)) { \ | ||
123 | pr_debug("\n%d: fda->entries[%d].revents(%d) != %d!", \ | ||
124 | __LINE__, _idx, fda->entries[_idx].fd, _revents); \ | ||
125 | goto out_delete; \ | ||
126 | } | ||
127 | |||
128 | #define FDA_ADD(_idx, _fd, _revents, _nr) \ | ||
129 | if (fdarray__add(fda, _fd, _revents) < 0) { \ | ||
130 | pr_debug("\n%d: fdarray__add(fda, %d, %d) failed!", \ | ||
131 | __LINE__,_fd, _revents); \ | ||
132 | goto out_delete; \ | ||
133 | } \ | ||
134 | if (fda->nr != _nr) { \ | ||
135 | pr_debug("\n%d: fdarray__add(fda, %d, %d)=%d != %d", \ | ||
136 | __LINE__,_fd, _revents, fda->nr, _nr); \ | ||
137 | goto out_delete; \ | ||
138 | } \ | ||
139 | FDA_CHECK(_idx, _fd, _revents) | ||
140 | |||
141 | FDA_ADD(0, 1, POLLIN, 1); | ||
142 | FDA_ADD(1, 2, POLLERR, 2); | ||
143 | |||
144 | fdarray__fprintf_prefix(fda, "before growing array", stderr); | ||
145 | |||
146 | FDA_ADD(2, 35, POLLHUP, 3); | ||
147 | |||
148 | if (fda->entries == NULL) { | ||
149 | pr_debug("\nfdarray__add(fda, 35, POLLHUP) should have allocated fda->pollfd!"); | ||
150 | goto out_delete; | ||
151 | } | ||
152 | |||
153 | fdarray__fprintf_prefix(fda, "after 3rd add", stderr); | ||
154 | |||
155 | FDA_ADD(3, 88, POLLIN | POLLOUT, 4); | ||
156 | |||
157 | fdarray__fprintf_prefix(fda, "after 4th add", stderr); | ||
158 | |||
159 | FDA_CHECK(0, 1, POLLIN); | ||
160 | FDA_CHECK(1, 2, POLLERR); | ||
161 | FDA_CHECK(2, 35, POLLHUP); | ||
162 | FDA_CHECK(3, 88, POLLIN | POLLOUT); | ||
163 | |||
164 | #undef FDA_ADD | ||
165 | #undef FDA_CHECK | ||
166 | |||
167 | pr_debug("\n"); | ||
168 | |||
169 | err = 0; | ||
170 | out_delete: | ||
171 | fdarray__delete(fda); | ||
172 | out: | ||
173 | return err; | ||
174 | } | ||
diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c index 142263492f6f..9b9622a33932 100644 --- a/tools/perf/tests/mmap-basic.c +++ b/tools/perf/tests/mmap-basic.c | |||
@@ -31,6 +31,7 @@ int test__basic_mmap(void) | |||
31 | unsigned int nr_events[nsyscalls], | 31 | unsigned int nr_events[nsyscalls], |
32 | expected_nr_events[nsyscalls], i, j; | 32 | expected_nr_events[nsyscalls], i, j; |
33 | struct perf_evsel *evsels[nsyscalls], *evsel; | 33 | struct perf_evsel *evsels[nsyscalls], *evsel; |
34 | char sbuf[STRERR_BUFSIZE]; | ||
34 | 35 | ||
35 | threads = thread_map__new(-1, getpid(), UINT_MAX); | 36 | threads = thread_map__new(-1, getpid(), UINT_MAX); |
36 | if (threads == NULL) { | 37 | if (threads == NULL) { |
@@ -49,7 +50,7 @@ int test__basic_mmap(void) | |||
49 | sched_setaffinity(0, sizeof(cpu_set), &cpu_set); | 50 | sched_setaffinity(0, sizeof(cpu_set), &cpu_set); |
50 | if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) { | 51 | if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) { |
51 | pr_debug("sched_setaffinity() failed on CPU %d: %s ", | 52 | pr_debug("sched_setaffinity() failed on CPU %d: %s ", |
52 | cpus->map[0], strerror(errno)); | 53 | cpus->map[0], strerror_r(errno, sbuf, sizeof(sbuf))); |
53 | goto out_free_cpus; | 54 | goto out_free_cpus; |
54 | } | 55 | } |
55 | 56 | ||
@@ -79,7 +80,7 @@ int test__basic_mmap(void) | |||
79 | if (perf_evsel__open(evsels[i], cpus, threads) < 0) { | 80 | if (perf_evsel__open(evsels[i], cpus, threads) < 0) { |
80 | pr_debug("failed to open counter: %s, " | 81 | pr_debug("failed to open counter: %s, " |
81 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", | 82 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", |
82 | strerror(errno)); | 83 | strerror_r(errno, sbuf, sizeof(sbuf))); |
83 | goto out_delete_evlist; | 84 | goto out_delete_evlist; |
84 | } | 85 | } |
85 | 86 | ||
@@ -89,7 +90,7 @@ int test__basic_mmap(void) | |||
89 | 90 | ||
90 | if (perf_evlist__mmap(evlist, 128, true) < 0) { | 91 | if (perf_evlist__mmap(evlist, 128, true) < 0) { |
91 | pr_debug("failed to mmap events: %d (%s)\n", errno, | 92 | pr_debug("failed to mmap events: %d (%s)\n", errno, |
92 | strerror(errno)); | 93 | strerror_r(errno, sbuf, sizeof(sbuf))); |
93 | goto out_delete_evlist; | 94 | goto out_delete_evlist; |
94 | } | 95 | } |
95 | 96 | ||
diff --git a/tools/perf/tests/open-syscall-all-cpus.c b/tools/perf/tests/open-syscall-all-cpus.c index 5fecdbd2f5f7..8fa82d1700c7 100644 --- a/tools/perf/tests/open-syscall-all-cpus.c +++ b/tools/perf/tests/open-syscall-all-cpus.c | |||
@@ -12,6 +12,7 @@ int test__open_syscall_event_on_all_cpus(void) | |||
12 | unsigned int nr_open_calls = 111, i; | 12 | unsigned int nr_open_calls = 111, i; |
13 | cpu_set_t cpu_set; | 13 | cpu_set_t cpu_set; |
14 | struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX); | 14 | struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX); |
15 | char sbuf[STRERR_BUFSIZE]; | ||
15 | 16 | ||
16 | if (threads == NULL) { | 17 | if (threads == NULL) { |
17 | pr_debug("thread_map__new\n"); | 18 | pr_debug("thread_map__new\n"); |
@@ -35,7 +36,7 @@ int test__open_syscall_event_on_all_cpus(void) | |||
35 | if (perf_evsel__open(evsel, cpus, threads) < 0) { | 36 | if (perf_evsel__open(evsel, cpus, threads) < 0) { |
36 | pr_debug("failed to open counter: %s, " | 37 | pr_debug("failed to open counter: %s, " |
37 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", | 38 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", |
38 | strerror(errno)); | 39 | strerror_r(errno, sbuf, sizeof(sbuf))); |
39 | goto out_evsel_delete; | 40 | goto out_evsel_delete; |
40 | } | 41 | } |
41 | 42 | ||
@@ -56,7 +57,7 @@ int test__open_syscall_event_on_all_cpus(void) | |||
56 | if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) { | 57 | if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) { |
57 | pr_debug("sched_setaffinity() failed on CPU %d: %s ", | 58 | pr_debug("sched_setaffinity() failed on CPU %d: %s ", |
58 | cpus->map[cpu], | 59 | cpus->map[cpu], |
59 | strerror(errno)); | 60 | strerror_r(errno, sbuf, sizeof(sbuf))); |
60 | goto out_close_fd; | 61 | goto out_close_fd; |
61 | } | 62 | } |
62 | for (i = 0; i < ncalls; ++i) { | 63 | for (i = 0; i < ncalls; ++i) { |
diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c index 0785b64ffd6c..127dcae0b760 100644 --- a/tools/perf/tests/open-syscall-tp-fields.c +++ b/tools/perf/tests/open-syscall-tp-fields.c | |||
@@ -22,6 +22,7 @@ int test__syscall_open_tp_fields(void) | |||
22 | struct perf_evlist *evlist = perf_evlist__new(); | 22 | struct perf_evlist *evlist = perf_evlist__new(); |
23 | struct perf_evsel *evsel; | 23 | struct perf_evsel *evsel; |
24 | int err = -1, i, nr_events = 0, nr_polls = 0; | 24 | int err = -1, i, nr_events = 0, nr_polls = 0; |
25 | char sbuf[STRERR_BUFSIZE]; | ||
25 | 26 | ||
26 | if (evlist == NULL) { | 27 | if (evlist == NULL) { |
27 | pr_debug("%s: perf_evlist__new\n", __func__); | 28 | pr_debug("%s: perf_evlist__new\n", __func__); |
@@ -48,13 +49,15 @@ int test__syscall_open_tp_fields(void) | |||
48 | 49 | ||
49 | err = perf_evlist__open(evlist); | 50 | err = perf_evlist__open(evlist); |
50 | if (err < 0) { | 51 | if (err < 0) { |
51 | pr_debug("perf_evlist__open: %s\n", strerror(errno)); | 52 | pr_debug("perf_evlist__open: %s\n", |
53 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
52 | goto out_delete_evlist; | 54 | goto out_delete_evlist; |
53 | } | 55 | } |
54 | 56 | ||
55 | err = perf_evlist__mmap(evlist, UINT_MAX, false); | 57 | err = perf_evlist__mmap(evlist, UINT_MAX, false); |
56 | if (err < 0) { | 58 | if (err < 0) { |
57 | pr_debug("perf_evlist__mmap: %s\n", strerror(errno)); | 59 | pr_debug("perf_evlist__mmap: %s\n", |
60 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
58 | goto out_delete_evlist; | 61 | goto out_delete_evlist; |
59 | } | 62 | } |
60 | 63 | ||
@@ -102,7 +105,7 @@ int test__syscall_open_tp_fields(void) | |||
102 | } | 105 | } |
103 | 106 | ||
104 | if (nr_events == before) | 107 | if (nr_events == before) |
105 | poll(evlist->pollfd, evlist->nr_fds, 10); | 108 | perf_evlist__poll(evlist, 10); |
106 | 109 | ||
107 | if (++nr_polls > 5) { | 110 | if (++nr_polls > 5) { |
108 | pr_debug("%s: no events!\n", __func__); | 111 | pr_debug("%s: no events!\n", __func__); |
diff --git a/tools/perf/tests/open-syscall.c b/tools/perf/tests/open-syscall.c index c1dc7d25f38c..a33b2daae40f 100644 --- a/tools/perf/tests/open-syscall.c +++ b/tools/perf/tests/open-syscall.c | |||
@@ -9,6 +9,7 @@ int test__open_syscall_event(void) | |||
9 | struct perf_evsel *evsel; | 9 | struct perf_evsel *evsel; |
10 | unsigned int nr_open_calls = 111, i; | 10 | unsigned int nr_open_calls = 111, i; |
11 | struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX); | 11 | struct thread_map *threads = thread_map__new(-1, getpid(), UINT_MAX); |
12 | char sbuf[STRERR_BUFSIZE]; | ||
12 | 13 | ||
13 | if (threads == NULL) { | 14 | if (threads == NULL) { |
14 | pr_debug("thread_map__new\n"); | 15 | pr_debug("thread_map__new\n"); |
@@ -24,7 +25,7 @@ int test__open_syscall_event(void) | |||
24 | if (perf_evsel__open_per_thread(evsel, threads) < 0) { | 25 | if (perf_evsel__open_per_thread(evsel, threads) < 0) { |
25 | pr_debug("failed to open counter: %s, " | 26 | pr_debug("failed to open counter: %s, " |
26 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", | 27 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", |
27 | strerror(errno)); | 28 | strerror_r(errno, sbuf, sizeof(sbuf))); |
28 | goto out_evsel_delete; | 29 | goto out_evsel_delete; |
29 | } | 30 | } |
30 | 31 | ||
diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c index aca1a83dd13a..7a228a2a070b 100644 --- a/tools/perf/tests/perf-record.c +++ b/tools/perf/tests/perf-record.c | |||
@@ -59,6 +59,7 @@ int test__PERF_RECORD(void) | |||
59 | int err = -1, errs = 0, i, wakeups = 0; | 59 | int err = -1, errs = 0, i, wakeups = 0; |
60 | u32 cpu; | 60 | u32 cpu; |
61 | int total_events = 0, nr_events[PERF_RECORD_MAX] = { 0, }; | 61 | int total_events = 0, nr_events[PERF_RECORD_MAX] = { 0, }; |
62 | char sbuf[STRERR_BUFSIZE]; | ||
62 | 63 | ||
63 | if (evlist == NULL || argv == NULL) { | 64 | if (evlist == NULL || argv == NULL) { |
64 | pr_debug("Not enough memory to create evlist\n"); | 65 | pr_debug("Not enough memory to create evlist\n"); |
@@ -100,7 +101,8 @@ int test__PERF_RECORD(void) | |||
100 | 101 | ||
101 | err = sched__get_first_possible_cpu(evlist->workload.pid, &cpu_mask); | 102 | err = sched__get_first_possible_cpu(evlist->workload.pid, &cpu_mask); |
102 | if (err < 0) { | 103 | if (err < 0) { |
103 | pr_debug("sched__get_first_possible_cpu: %s\n", strerror(errno)); | 104 | pr_debug("sched__get_first_possible_cpu: %s\n", |
105 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
104 | goto out_delete_evlist; | 106 | goto out_delete_evlist; |
105 | } | 107 | } |
106 | 108 | ||
@@ -110,7 +112,8 @@ int test__PERF_RECORD(void) | |||
110 | * So that we can check perf_sample.cpu on all the samples. | 112 | * So that we can check perf_sample.cpu on all the samples. |
111 | */ | 113 | */ |
112 | if (sched_setaffinity(evlist->workload.pid, cpu_mask_size, &cpu_mask) < 0) { | 114 | if (sched_setaffinity(evlist->workload.pid, cpu_mask_size, &cpu_mask) < 0) { |
113 | pr_debug("sched_setaffinity: %s\n", strerror(errno)); | 115 | pr_debug("sched_setaffinity: %s\n", |
116 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
114 | goto out_delete_evlist; | 117 | goto out_delete_evlist; |
115 | } | 118 | } |
116 | 119 | ||
@@ -120,7 +123,8 @@ int test__PERF_RECORD(void) | |||
120 | */ | 123 | */ |
121 | err = perf_evlist__open(evlist); | 124 | err = perf_evlist__open(evlist); |
122 | if (err < 0) { | 125 | if (err < 0) { |
123 | pr_debug("perf_evlist__open: %s\n", strerror(errno)); | 126 | pr_debug("perf_evlist__open: %s\n", |
127 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
124 | goto out_delete_evlist; | 128 | goto out_delete_evlist; |
125 | } | 129 | } |
126 | 130 | ||
@@ -131,7 +135,8 @@ int test__PERF_RECORD(void) | |||
131 | */ | 135 | */ |
132 | err = perf_evlist__mmap(evlist, opts.mmap_pages, false); | 136 | err = perf_evlist__mmap(evlist, opts.mmap_pages, false); |
133 | if (err < 0) { | 137 | if (err < 0) { |
134 | pr_debug("perf_evlist__mmap: %s\n", strerror(errno)); | 138 | pr_debug("perf_evlist__mmap: %s\n", |
139 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
135 | goto out_delete_evlist; | 140 | goto out_delete_evlist; |
136 | } | 141 | } |
137 | 142 | ||
@@ -263,7 +268,7 @@ int test__PERF_RECORD(void) | |||
263 | * perf_event_attr.wakeup_events, just PERF_EVENT_SAMPLE does. | 268 | * perf_event_attr.wakeup_events, just PERF_EVENT_SAMPLE does. |
264 | */ | 269 | */ |
265 | if (total_events == before && false) | 270 | if (total_events == before && false) |
266 | poll(evlist->pollfd, evlist->nr_fds, -1); | 271 | perf_evlist__poll(evlist, -1); |
267 | 272 | ||
268 | sleep(1); | 273 | sleep(1); |
269 | if (++wakeups > 5) { | 274 | if (++wakeups > 5) { |
diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index 12b322fa3475..eeb68bb1972d 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c | |||
@@ -152,7 +152,7 @@ int test__pmu(void) | |||
152 | if (ret) | 152 | if (ret) |
153 | break; | 153 | break; |
154 | 154 | ||
155 | ret = perf_pmu__config_terms(&formats, &attr, terms); | 155 | ret = perf_pmu__config_terms(&formats, &attr, terms, false); |
156 | if (ret) | 156 | if (ret) |
157 | break; | 157 | break; |
158 | 158 | ||
diff --git a/tools/perf/tests/rdpmc.c b/tools/perf/tests/rdpmc.c index c04d1f268576..d31f2c4d9f64 100644 --- a/tools/perf/tests/rdpmc.c +++ b/tools/perf/tests/rdpmc.c | |||
@@ -100,6 +100,7 @@ static int __test__rdpmc(void) | |||
100 | }; | 100 | }; |
101 | u64 delta_sum = 0; | 101 | u64 delta_sum = 0; |
102 | struct sigaction sa; | 102 | struct sigaction sa; |
103 | char sbuf[STRERR_BUFSIZE]; | ||
103 | 104 | ||
104 | sigfillset(&sa.sa_mask); | 105 | sigfillset(&sa.sa_mask); |
105 | sa.sa_sigaction = segfault_handler; | 106 | sa.sa_sigaction = segfault_handler; |
@@ -109,14 +110,15 @@ static int __test__rdpmc(void) | |||
109 | perf_event_open_cloexec_flag()); | 110 | perf_event_open_cloexec_flag()); |
110 | if (fd < 0) { | 111 | if (fd < 0) { |
111 | pr_err("Error: sys_perf_event_open() syscall returned " | 112 | pr_err("Error: sys_perf_event_open() syscall returned " |
112 | "with %d (%s)\n", fd, strerror(errno)); | 113 | "with %d (%s)\n", fd, |
114 | strerror_r(errno, sbuf, sizeof(sbuf))); | ||
113 | return -1; | 115 | return -1; |
114 | } | 116 | } |
115 | 117 | ||
116 | addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED, fd, 0); | 118 | addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED, fd, 0); |
117 | if (addr == (void *)(-1)) { | 119 | if (addr == (void *)(-1)) { |
118 | pr_err("Error: mmap() syscall returned with (%s)\n", | 120 | pr_err("Error: mmap() syscall returned with (%s)\n", |
119 | strerror(errno)); | 121 | strerror_r(errno, sbuf, sizeof(sbuf))); |
120 | goto out_close; | 122 | goto out_close; |
121 | } | 123 | } |
122 | 124 | ||
diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c index 983d6b8562a8..1aa21c90731b 100644 --- a/tools/perf/tests/sw-clock.c +++ b/tools/perf/tests/sw-clock.c | |||
@@ -22,6 +22,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) | |||
22 | volatile int tmp = 0; | 22 | volatile int tmp = 0; |
23 | u64 total_periods = 0; | 23 | u64 total_periods = 0; |
24 | int nr_samples = 0; | 24 | int nr_samples = 0; |
25 | char sbuf[STRERR_BUFSIZE]; | ||
25 | union perf_event *event; | 26 | union perf_event *event; |
26 | struct perf_evsel *evsel; | 27 | struct perf_evsel *evsel; |
27 | struct perf_evlist *evlist; | 28 | struct perf_evlist *evlist; |
@@ -62,14 +63,15 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) | |||
62 | 63 | ||
63 | err = -errno; | 64 | err = -errno; |
64 | pr_debug("Couldn't open evlist: %s\nHint: check %s, using %" PRIu64 " in this test.\n", | 65 | pr_debug("Couldn't open evlist: %s\nHint: check %s, using %" PRIu64 " in this test.\n", |
65 | strerror(errno), knob, (u64)attr.sample_freq); | 66 | strerror_r(errno, sbuf, sizeof(sbuf)), |
67 | knob, (u64)attr.sample_freq); | ||
66 | goto out_delete_evlist; | 68 | goto out_delete_evlist; |
67 | } | 69 | } |
68 | 70 | ||
69 | err = perf_evlist__mmap(evlist, 128, true); | 71 | err = perf_evlist__mmap(evlist, 128, true); |
70 | if (err < 0) { | 72 | if (err < 0) { |
71 | pr_debug("failed to mmap event: %d (%s)\n", errno, | 73 | pr_debug("failed to mmap event: %d (%s)\n", errno, |
72 | strerror(errno)); | 74 | strerror_r(errno, sbuf, sizeof(sbuf))); |
73 | goto out_delete_evlist; | 75 | goto out_delete_evlist; |
74 | } | 76 | } |
75 | 77 | ||
diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c new file mode 100644 index 000000000000..cc68648c7c55 --- /dev/null +++ b/tools/perf/tests/switch-tracking.c | |||
@@ -0,0 +1,572 @@ | |||
1 | #include <sys/time.h> | ||
2 | #include <sys/prctl.h> | ||
3 | #include <time.h> | ||
4 | #include <stdlib.h> | ||
5 | |||
6 | #include "parse-events.h" | ||
7 | #include "evlist.h" | ||
8 | #include "evsel.h" | ||
9 | #include "thread_map.h" | ||
10 | #include "cpumap.h" | ||
11 | #include "tests.h" | ||
12 | |||
13 | static int spin_sleep(void) | ||
14 | { | ||
15 | struct timeval start, now, diff, maxtime; | ||
16 | struct timespec ts; | ||
17 | int err, i; | ||
18 | |||
19 | maxtime.tv_sec = 0; | ||
20 | maxtime.tv_usec = 50000; | ||
21 | |||
22 | err = gettimeofday(&start, NULL); | ||
23 | if (err) | ||
24 | return err; | ||
25 | |||
26 | /* Spin for 50ms */ | ||
27 | while (1) { | ||
28 | for (i = 0; i < 1000; i++) | ||
29 | barrier(); | ||
30 | |||
31 | err = gettimeofday(&now, NULL); | ||
32 | if (err) | ||
33 | return err; | ||
34 | |||
35 | timersub(&now, &start, &diff); | ||
36 | if (timercmp(&diff, &maxtime, > /* For checkpatch */)) | ||
37 | break; | ||
38 | } | ||
39 | |||
40 | ts.tv_nsec = 50 * 1000 * 1000; | ||
41 | ts.tv_sec = 0; | ||
42 | |||
43 | /* Sleep for 50ms */ | ||
44 | err = nanosleep(&ts, NULL); | ||
45 | if (err == EINTR) | ||
46 | err = 0; | ||
47 | |||
48 | return err; | ||
49 | } | ||
50 | |||
51 | struct switch_tracking { | ||
52 | struct perf_evsel *switch_evsel; | ||
53 | struct perf_evsel *cycles_evsel; | ||
54 | pid_t *tids; | ||
55 | int nr_tids; | ||
56 | int comm_seen[4]; | ||
57 | int cycles_before_comm_1; | ||
58 | int cycles_between_comm_2_and_comm_3; | ||
59 | int cycles_after_comm_4; | ||
60 | }; | ||
61 | |||
62 | static int check_comm(struct switch_tracking *switch_tracking, | ||
63 | union perf_event *event, const char *comm, int nr) | ||
64 | { | ||
65 | if (event->header.type == PERF_RECORD_COMM && | ||
66 | (pid_t)event->comm.pid == getpid() && | ||
67 | (pid_t)event->comm.tid == getpid() && | ||
68 | strcmp(event->comm.comm, comm) == 0) { | ||
69 | if (switch_tracking->comm_seen[nr]) { | ||
70 | pr_debug("Duplicate comm event\n"); | ||
71 | return -1; | ||
72 | } | ||
73 | switch_tracking->comm_seen[nr] = 1; | ||
74 | pr_debug3("comm event: %s nr: %d\n", event->comm.comm, nr); | ||
75 | return 1; | ||
76 | } | ||
77 | return 0; | ||
78 | } | ||
79 | |||
80 | static int check_cpu(struct switch_tracking *switch_tracking, int cpu) | ||
81 | { | ||
82 | int i, nr = cpu + 1; | ||
83 | |||
84 | if (cpu < 0) | ||
85 | return -1; | ||
86 | |||
87 | if (!switch_tracking->tids) { | ||
88 | switch_tracking->tids = calloc(nr, sizeof(pid_t)); | ||
89 | if (!switch_tracking->tids) | ||
90 | return -1; | ||
91 | for (i = 0; i < nr; i++) | ||
92 | switch_tracking->tids[i] = -1; | ||
93 | switch_tracking->nr_tids = nr; | ||
94 | return 0; | ||
95 | } | ||
96 | |||
97 | if (cpu >= switch_tracking->nr_tids) { | ||
98 | void *addr; | ||
99 | |||
100 | addr = realloc(switch_tracking->tids, nr * sizeof(pid_t)); | ||
101 | if (!addr) | ||
102 | return -1; | ||
103 | switch_tracking->tids = addr; | ||
104 | for (i = switch_tracking->nr_tids; i < nr; i++) | ||
105 | switch_tracking->tids[i] = -1; | ||
106 | switch_tracking->nr_tids = nr; | ||
107 | return 0; | ||
108 | } | ||
109 | |||
110 | return 0; | ||
111 | } | ||
112 | |||
113 | static int process_sample_event(struct perf_evlist *evlist, | ||
114 | union perf_event *event, | ||
115 | struct switch_tracking *switch_tracking) | ||
116 | { | ||
117 | struct perf_sample sample; | ||
118 | struct perf_evsel *evsel; | ||
119 | pid_t next_tid, prev_tid; | ||
120 | int cpu, err; | ||
121 | |||
122 | if (perf_evlist__parse_sample(evlist, event, &sample)) { | ||
123 | pr_debug("perf_evlist__parse_sample failed\n"); | ||
124 | return -1; | ||
125 | } | ||
126 | |||
127 | evsel = perf_evlist__id2evsel(evlist, sample.id); | ||
128 | if (evsel == switch_tracking->switch_evsel) { | ||
129 | next_tid = perf_evsel__intval(evsel, &sample, "next_pid"); | ||
130 | prev_tid = perf_evsel__intval(evsel, &sample, "prev_pid"); | ||
131 | cpu = sample.cpu; | ||
132 | pr_debug3("sched_switch: cpu: %d prev_tid %d next_tid %d\n", | ||
133 | cpu, prev_tid, next_tid); | ||
134 | err = check_cpu(switch_tracking, cpu); | ||
135 | if (err) | ||
136 | return err; | ||
137 | /* | ||
138 | * Check for no missing sched_switch events i.e. that the | ||
139 | * evsel->system_wide flag has worked. | ||
140 | */ | ||
141 | if (switch_tracking->tids[cpu] != -1 && | ||
142 | switch_tracking->tids[cpu] != prev_tid) { | ||
143 | pr_debug("Missing sched_switch events\n"); | ||
144 | return -1; | ||
145 | } | ||
146 | switch_tracking->tids[cpu] = next_tid; | ||
147 | } | ||
148 | |||
149 | if (evsel == switch_tracking->cycles_evsel) { | ||
150 | pr_debug3("cycles event\n"); | ||
151 | if (!switch_tracking->comm_seen[0]) | ||
152 | switch_tracking->cycles_before_comm_1 = 1; | ||
153 | if (switch_tracking->comm_seen[1] && | ||
154 | !switch_tracking->comm_seen[2]) | ||
155 | switch_tracking->cycles_between_comm_2_and_comm_3 = 1; | ||
156 | if (switch_tracking->comm_seen[3]) | ||
157 | switch_tracking->cycles_after_comm_4 = 1; | ||
158 | } | ||
159 | |||
160 | return 0; | ||
161 | } | ||
162 | |||
163 | static int process_event(struct perf_evlist *evlist, union perf_event *event, | ||
164 | struct switch_tracking *switch_tracking) | ||
165 | { | ||
166 | if (event->header.type == PERF_RECORD_SAMPLE) | ||
167 | return process_sample_event(evlist, event, switch_tracking); | ||
168 | |||
169 | if (event->header.type == PERF_RECORD_COMM) { | ||
170 | int err, done = 0; | ||
171 | |||
172 | err = check_comm(switch_tracking, event, "Test COMM 1", 0); | ||
173 | if (err < 0) | ||
174 | return -1; | ||
175 | done += err; | ||
176 | err = check_comm(switch_tracking, event, "Test COMM 2", 1); | ||
177 | if (err < 0) | ||
178 | return -1; | ||
179 | done += err; | ||
180 | err = check_comm(switch_tracking, event, "Test COMM 3", 2); | ||
181 | if (err < 0) | ||
182 | return -1; | ||
183 | done += err; | ||
184 | err = check_comm(switch_tracking, event, "Test COMM 4", 3); | ||
185 | if (err < 0) | ||
186 | return -1; | ||
187 | done += err; | ||
188 | if (done != 1) { | ||
189 | pr_debug("Unexpected comm event\n"); | ||
190 | return -1; | ||
191 | } | ||
192 | } | ||
193 | |||
194 | return 0; | ||
195 | } | ||
196 | |||
197 | struct event_node { | ||
198 | struct list_head list; | ||
199 | union perf_event *event; | ||
200 | u64 event_time; | ||
201 | }; | ||
202 | |||
203 | static int add_event(struct perf_evlist *evlist, struct list_head *events, | ||
204 | union perf_event *event) | ||
205 | { | ||
206 | struct perf_sample sample; | ||
207 | struct event_node *node; | ||
208 | |||
209 | node = malloc(sizeof(struct event_node)); | ||
210 | if (!node) { | ||
211 | pr_debug("malloc failed\n"); | ||
212 | return -1; | ||
213 | } | ||
214 | node->event = event; | ||
215 | list_add(&node->list, events); | ||
216 | |||
217 | if (perf_evlist__parse_sample(evlist, event, &sample)) { | ||
218 | pr_debug("perf_evlist__parse_sample failed\n"); | ||
219 | return -1; | ||
220 | } | ||
221 | |||
222 | if (!sample.time) { | ||
223 | pr_debug("event with no time\n"); | ||
224 | return -1; | ||
225 | } | ||
226 | |||
227 | node->event_time = sample.time; | ||
228 | |||
229 | return 0; | ||
230 | } | ||
231 | |||
232 | static void free_event_nodes(struct list_head *events) | ||
233 | { | ||
234 | struct event_node *node; | ||
235 | |||
236 | while (!list_empty(events)) { | ||
237 | node = list_entry(events->next, struct event_node, list); | ||
238 | list_del(&node->list); | ||
239 | free(node); | ||
240 | } | ||
241 | } | ||
242 | |||
243 | static int compar(const void *a, const void *b) | ||
244 | { | ||
245 | const struct event_node *nodea = a; | ||
246 | const struct event_node *nodeb = b; | ||
247 | s64 cmp = nodea->event_time - nodeb->event_time; | ||
248 | |||
249 | return cmp; | ||
250 | } | ||
251 | |||
252 | static int process_events(struct perf_evlist *evlist, | ||
253 | struct switch_tracking *switch_tracking) | ||
254 | { | ||
255 | union perf_event *event; | ||
256 | unsigned pos, cnt = 0; | ||
257 | LIST_HEAD(events); | ||
258 | struct event_node *events_array, *node; | ||
259 | int i, ret; | ||
260 | |||
261 | for (i = 0; i < evlist->nr_mmaps; i++) { | ||
262 | while ((event = perf_evlist__mmap_read(evlist, i)) != NULL) { | ||
263 | cnt += 1; | ||
264 | ret = add_event(evlist, &events, event); | ||
265 | perf_evlist__mmap_consume(evlist, i); | ||
266 | if (ret < 0) | ||
267 | goto out_free_nodes; | ||
268 | } | ||
269 | } | ||
270 | |||
271 | events_array = calloc(cnt, sizeof(struct event_node)); | ||
272 | if (!events_array) { | ||
273 | pr_debug("calloc failed\n"); | ||
274 | ret = -1; | ||
275 | goto out_free_nodes; | ||
276 | } | ||
277 | |||
278 | pos = 0; | ||
279 | list_for_each_entry(node, &events, list) | ||
280 | events_array[pos++] = *node; | ||
281 | |||
282 | qsort(events_array, cnt, sizeof(struct event_node), compar); | ||
283 | |||
284 | for (pos = 0; pos < cnt; pos++) { | ||
285 | ret = process_event(evlist, events_array[pos].event, | ||
286 | switch_tracking); | ||
287 | if (ret < 0) | ||
288 | goto out_free; | ||
289 | } | ||
290 | |||
291 | ret = 0; | ||
292 | out_free: | ||
293 | pr_debug("%u events recorded\n", cnt); | ||
294 | free(events_array); | ||
295 | out_free_nodes: | ||
296 | free_event_nodes(&events); | ||
297 | return ret; | ||
298 | } | ||
299 | |||
300 | /** | ||
301 | * test__switch_tracking - test using sched_switch and tracking events. | ||
302 | * | ||
303 | * This function implements a test that checks that sched_switch events and | ||
304 | * tracking events can be recorded for a workload (current process) using the | ||
305 | * evsel->system_wide and evsel->tracking flags (respectively) with other events | ||
306 | * sometimes enabled or disabled. | ||
307 | */ | ||
308 | int test__switch_tracking(void) | ||
309 | { | ||
310 | const char *sched_switch = "sched:sched_switch"; | ||
311 | struct switch_tracking switch_tracking = { .tids = NULL, }; | ||
312 | struct record_opts opts = { | ||
313 | .mmap_pages = UINT_MAX, | ||
314 | .user_freq = UINT_MAX, | ||
315 | .user_interval = ULLONG_MAX, | ||
316 | .freq = 4000, | ||
317 | .target = { | ||
318 | .uses_mmap = true, | ||
319 | }, | ||
320 | }; | ||
321 | struct thread_map *threads = NULL; | ||
322 | struct cpu_map *cpus = NULL; | ||
323 | struct perf_evlist *evlist = NULL; | ||
324 | struct perf_evsel *evsel, *cpu_clocks_evsel, *cycles_evsel; | ||
325 | struct perf_evsel *switch_evsel, *tracking_evsel; | ||
326 | const char *comm; | ||
327 | int err = -1; | ||
328 | |||
329 | threads = thread_map__new(-1, getpid(), UINT_MAX); | ||
330 | if (!threads) { | ||
331 | pr_debug("thread_map__new failed!\n"); | ||
332 | goto out_err; | ||
333 | } | ||
334 | |||
335 | cpus = cpu_map__new(NULL); | ||
336 | if (!cpus) { | ||
337 | pr_debug("cpu_map__new failed!\n"); | ||
338 | goto out_err; | ||
339 | } | ||
340 | |||
341 | evlist = perf_evlist__new(); | ||
342 | if (!evlist) { | ||
343 | pr_debug("perf_evlist__new failed!\n"); | ||
344 | goto out_err; | ||
345 | } | ||
346 | |||
347 | perf_evlist__set_maps(evlist, cpus, threads); | ||
348 | |||
349 | /* First event */ | ||
350 | err = parse_events(evlist, "cpu-clock:u"); | ||
351 | if (err) { | ||
352 | pr_debug("Failed to parse event dummy:u\n"); | ||
353 | goto out_err; | ||
354 | } | ||
355 | |||
356 | cpu_clocks_evsel = perf_evlist__last(evlist); | ||
357 | |||
358 | /* Second event */ | ||
359 | err = parse_events(evlist, "cycles:u"); | ||
360 | if (err) { | ||
361 | pr_debug("Failed to parse event cycles:u\n"); | ||
362 | goto out_err; | ||
363 | } | ||
364 | |||
365 | cycles_evsel = perf_evlist__last(evlist); | ||
366 | |||
367 | /* Third event */ | ||
368 | if (!perf_evlist__can_select_event(evlist, sched_switch)) { | ||
369 | fprintf(stderr, " (no sched_switch)"); | ||
370 | err = 0; | ||
371 | goto out; | ||
372 | } | ||
373 | |||
374 | err = parse_events(evlist, sched_switch); | ||
375 | if (err) { | ||
376 | pr_debug("Failed to parse event %s\n", sched_switch); | ||
377 | goto out_err; | ||
378 | } | ||
379 | |||
380 | switch_evsel = perf_evlist__last(evlist); | ||
381 | |||
382 | perf_evsel__set_sample_bit(switch_evsel, CPU); | ||
383 | perf_evsel__set_sample_bit(switch_evsel, TIME); | ||
384 | |||
385 | switch_evsel->system_wide = true; | ||
386 | switch_evsel->no_aux_samples = true; | ||
387 | switch_evsel->immediate = true; | ||
388 | |||
389 | /* Test moving an event to the front */ | ||
390 | if (cycles_evsel == perf_evlist__first(evlist)) { | ||
391 | pr_debug("cycles event already at front"); | ||
392 | goto out_err; | ||
393 | } | ||
394 | perf_evlist__to_front(evlist, cycles_evsel); | ||
395 | if (cycles_evsel != perf_evlist__first(evlist)) { | ||
396 | pr_debug("Failed to move cycles event to front"); | ||
397 | goto out_err; | ||
398 | } | ||
399 | |||
400 | perf_evsel__set_sample_bit(cycles_evsel, CPU); | ||
401 | perf_evsel__set_sample_bit(cycles_evsel, TIME); | ||
402 | |||
403 | /* Fourth event */ | ||
404 | err = parse_events(evlist, "dummy:u"); | ||
405 | if (err) { | ||
406 | pr_debug("Failed to parse event dummy:u\n"); | ||
407 | goto out_err; | ||
408 | } | ||
409 | |||
410 | tracking_evsel = perf_evlist__last(evlist); | ||
411 | |||
412 | perf_evlist__set_tracking_event(evlist, tracking_evsel); | ||
413 | |||
414 | tracking_evsel->attr.freq = 0; | ||
415 | tracking_evsel->attr.sample_period = 1; | ||
416 | |||
417 | perf_evsel__set_sample_bit(tracking_evsel, TIME); | ||
418 | |||
419 | /* Config events */ | ||
420 | perf_evlist__config(evlist, &opts); | ||
421 | |||
422 | /* Check moved event is still at the front */ | ||
423 | if (cycles_evsel != perf_evlist__first(evlist)) { | ||
424 | pr_debug("Front event no longer at front"); | ||
425 | goto out_err; | ||
426 | } | ||
427 | |||
428 | /* Check tracking event is tracking */ | ||
429 | if (!tracking_evsel->attr.mmap || !tracking_evsel->attr.comm) { | ||
430 | pr_debug("Tracking event not tracking\n"); | ||
431 | goto out_err; | ||
432 | } | ||
433 | |||
434 | /* Check non-tracking events are not tracking */ | ||
435 | evlist__for_each(evlist, evsel) { | ||
436 | if (evsel != tracking_evsel) { | ||
437 | if (evsel->attr.mmap || evsel->attr.comm) { | ||
438 | pr_debug("Non-tracking event is tracking\n"); | ||
439 | goto out_err; | ||
440 | } | ||
441 | } | ||
442 | } | ||
443 | |||
444 | if (perf_evlist__open(evlist) < 0) { | ||
445 | fprintf(stderr, " (not supported)"); | ||
446 | err = 0; | ||
447 | goto out; | ||
448 | } | ||
449 | |||
450 | err = perf_evlist__mmap(evlist, UINT_MAX, false); | ||
451 | if (err) { | ||
452 | pr_debug("perf_evlist__mmap failed!\n"); | ||
453 | goto out_err; | ||
454 | } | ||
455 | |||
456 | perf_evlist__enable(evlist); | ||
457 | |||
458 | err = perf_evlist__disable_event(evlist, cpu_clocks_evsel); | ||
459 | if (err) { | ||
460 | pr_debug("perf_evlist__disable_event failed!\n"); | ||
461 | goto out_err; | ||
462 | } | ||
463 | |||
464 | err = spin_sleep(); | ||
465 | if (err) { | ||
466 | pr_debug("spin_sleep failed!\n"); | ||
467 | goto out_err; | ||
468 | } | ||
469 | |||
470 | comm = "Test COMM 1"; | ||
471 | err = prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0); | ||
472 | if (err) { | ||
473 | pr_debug("PR_SET_NAME failed!\n"); | ||
474 | goto out_err; | ||
475 | } | ||
476 | |||
477 | err = perf_evlist__disable_event(evlist, cycles_evsel); | ||
478 | if (err) { | ||
479 | pr_debug("perf_evlist__disable_event failed!\n"); | ||
480 | goto out_err; | ||
481 | } | ||
482 | |||
483 | comm = "Test COMM 2"; | ||
484 | err = prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0); | ||
485 | if (err) { | ||
486 | pr_debug("PR_SET_NAME failed!\n"); | ||
487 | goto out_err; | ||
488 | } | ||
489 | |||
490 | err = spin_sleep(); | ||
491 | if (err) { | ||
492 | pr_debug("spin_sleep failed!\n"); | ||
493 | goto out_err; | ||
494 | } | ||
495 | |||
496 | comm = "Test COMM 3"; | ||
497 | err = prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0); | ||
498 | if (err) { | ||
499 | pr_debug("PR_SET_NAME failed!\n"); | ||
500 | goto out_err; | ||
501 | } | ||
502 | |||
503 | err = perf_evlist__enable_event(evlist, cycles_evsel); | ||
504 | if (err) { | ||
505 | pr_debug("perf_evlist__disable_event failed!\n"); | ||
506 | goto out_err; | ||
507 | } | ||
508 | |||
509 | comm = "Test COMM 4"; | ||
510 | err = prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0); | ||
511 | if (err) { | ||
512 | pr_debug("PR_SET_NAME failed!\n"); | ||
513 | goto out_err; | ||
514 | } | ||
515 | |||
516 | err = spin_sleep(); | ||
517 | if (err) { | ||
518 | pr_debug("spin_sleep failed!\n"); | ||
519 | goto out_err; | ||
520 | } | ||
521 | |||
522 | perf_evlist__disable(evlist); | ||
523 | |||
524 | switch_tracking.switch_evsel = switch_evsel; | ||
525 | switch_tracking.cycles_evsel = cycles_evsel; | ||
526 | |||
527 | err = process_events(evlist, &switch_tracking); | ||
528 | |||
529 | zfree(&switch_tracking.tids); | ||
530 | |||
531 | if (err) | ||
532 | goto out_err; | ||
533 | |||
534 | /* Check all 4 comm events were seen i.e. that evsel->tracking works */ | ||
535 | if (!switch_tracking.comm_seen[0] || !switch_tracking.comm_seen[1] || | ||
536 | !switch_tracking.comm_seen[2] || !switch_tracking.comm_seen[3]) { | ||
537 | pr_debug("Missing comm events\n"); | ||
538 | goto out_err; | ||
539 | } | ||
540 | |||
541 | /* Check cycles event got enabled */ | ||
542 | if (!switch_tracking.cycles_before_comm_1) { | ||
543 | pr_debug("Missing cycles events\n"); | ||
544 | goto out_err; | ||
545 | } | ||
546 | |||
547 | /* Check cycles event got disabled */ | ||
548 | if (switch_tracking.cycles_between_comm_2_and_comm_3) { | ||
549 | pr_debug("cycles events even though event was disabled\n"); | ||
550 | goto out_err; | ||
551 | } | ||
552 | |||
553 | /* Check cycles event got enabled again */ | ||
554 | if (!switch_tracking.cycles_after_comm_4) { | ||
555 | pr_debug("Missing cycles events\n"); | ||
556 | goto out_err; | ||
557 | } | ||
558 | out: | ||
559 | if (evlist) { | ||
560 | perf_evlist__disable(evlist); | ||
561 | perf_evlist__delete(evlist); | ||
562 | } else { | ||
563 | cpu_map__delete(cpus); | ||
564 | thread_map__delete(threads); | ||
565 | } | ||
566 | |||
567 | return err; | ||
568 | |||
569 | out_err: | ||
570 | err = -1; | ||
571 | goto out; | ||
572 | } | ||
diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c index 5ff3db318f12..3a8fedef83bc 100644 --- a/tools/perf/tests/task-exit.c +++ b/tools/perf/tests/task-exit.c | |||
@@ -42,6 +42,7 @@ int test__task_exit(void) | |||
42 | .uses_mmap = true, | 42 | .uses_mmap = true, |
43 | }; | 43 | }; |
44 | const char *argv[] = { "true", NULL }; | 44 | const char *argv[] = { "true", NULL }; |
45 | char sbuf[STRERR_BUFSIZE]; | ||
45 | 46 | ||
46 | signal(SIGCHLD, sig_handler); | 47 | signal(SIGCHLD, sig_handler); |
47 | 48 | ||
@@ -82,13 +83,14 @@ int test__task_exit(void) | |||
82 | 83 | ||
83 | err = perf_evlist__open(evlist); | 84 | err = perf_evlist__open(evlist); |
84 | if (err < 0) { | 85 | if (err < 0) { |
85 | pr_debug("Couldn't open the evlist: %s\n", strerror(-err)); | 86 | pr_debug("Couldn't open the evlist: %s\n", |
87 | strerror_r(-err, sbuf, sizeof(sbuf))); | ||
86 | goto out_delete_evlist; | 88 | goto out_delete_evlist; |
87 | } | 89 | } |
88 | 90 | ||
89 | if (perf_evlist__mmap(evlist, 128, true) < 0) { | 91 | if (perf_evlist__mmap(evlist, 128, true) < 0) { |
90 | pr_debug("failed to mmap events: %d (%s)\n", errno, | 92 | pr_debug("failed to mmap events: %d (%s)\n", errno, |
91 | strerror(errno)); | 93 | strerror_r(errno, sbuf, sizeof(sbuf))); |
92 | goto out_delete_evlist; | 94 | goto out_delete_evlist; |
93 | } | 95 | } |
94 | 96 | ||
@@ -103,7 +105,7 @@ retry: | |||
103 | } | 105 | } |
104 | 106 | ||
105 | if (!exited || !nr_exit) { | 107 | if (!exited || !nr_exit) { |
106 | poll(evlist->pollfd, evlist->nr_fds, -1); | 108 | perf_evlist__poll(evlist, -1); |
107 | goto retry; | 109 | goto retry; |
108 | } | 110 | } |
109 | 111 | ||
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index ed64790a395f..00e776a87a9c 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h | |||
@@ -48,6 +48,9 @@ int test__mmap_thread_lookup(void); | |||
48 | int test__thread_mg_share(void); | 48 | int test__thread_mg_share(void); |
49 | int test__hists_output(void); | 49 | int test__hists_output(void); |
50 | int test__hists_cumulate(void); | 50 | int test__hists_cumulate(void); |
51 | int test__switch_tracking(void); | ||
52 | int test__fdarray__filter(void); | ||
53 | int test__fdarray__add(void); | ||
51 | 54 | ||
52 | #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) | 55 | #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) |
53 | #ifdef HAVE_DWARF_UNWIND_SUPPORT | 56 | #ifdef HAVE_DWARF_UNWIND_SUPPORT |