diff options
author | Jiri Olsa <jolsa@redhat.com> | 2012-11-09 19:46:42 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-11-14 14:49:17 -0500 |
commit | d3b59a38bcdab4248134023c2c5dfabee5a4878e (patch) | |
tree | ea7dad332d4fe0ecbf84ffc06cc9660df32effb8 /tools | |
parent | 0a4e1ae6808a28a92573550603121b146b11312e (diff) |
perf tests: Move test__open_syscall_event into separate object
Separating test__open_syscall_event test from the builtin-test into
open-syscall object.
Adding util object under tests directory to gather help functions common
to more tests.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1352508412-16914-3-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Makefile | 2 | ||||
-rw-r--r-- | tools/perf/tests/builtin-test.c | 84 | ||||
-rw-r--r-- | tools/perf/tests/open-syscall.c | 66 | ||||
-rw-r--r-- | tools/perf/tests/tests.h | 5 | ||||
-rw-r--r-- | tools/perf/tests/util.c | 30 |
5 files changed, 103 insertions, 84 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 7c7ba4d6dafd..69f582c53cbb 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -432,6 +432,8 @@ LIB_OBJS += $(OUTPUT)tests/parse-events.o | |||
432 | LIB_OBJS += $(OUTPUT)tests/dso-data.o | 432 | LIB_OBJS += $(OUTPUT)tests/dso-data.o |
433 | LIB_OBJS += $(OUTPUT)tests/attr.o | 433 | LIB_OBJS += $(OUTPUT)tests/attr.o |
434 | LIB_OBJS += $(OUTPUT)tests/vmlinux-kallsyms.o | 434 | LIB_OBJS += $(OUTPUT)tests/vmlinux-kallsyms.o |
435 | LIB_OBJS += $(OUTPUT)tests/open-syscall.o | ||
436 | LIB_OBJS += $(OUTPUT)tests/util.o | ||
435 | 437 | ||
436 | BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o | 438 | BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o |
437 | BUILTIN_OBJS += $(OUTPUT)builtin-bench.o | 439 | BUILTIN_OBJS += $(OUTPUT)builtin-bench.o |
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 5bc9063bf30f..b6b1e46a51c6 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c | |||
@@ -27,90 +27,6 @@ | |||
27 | 27 | ||
28 | #include "tests.h" | 28 | #include "tests.h" |
29 | 29 | ||
30 | static int trace_event__id(const char *evname) | ||
31 | { | ||
32 | char *filename; | ||
33 | int err = -1, fd; | ||
34 | |||
35 | if (asprintf(&filename, | ||
36 | "%s/syscalls/%s/id", | ||
37 | tracing_events_path, evname) < 0) | ||
38 | return -1; | ||
39 | |||
40 | fd = open(filename, O_RDONLY); | ||
41 | if (fd >= 0) { | ||
42 | char id[16]; | ||
43 | if (read(fd, id, sizeof(id)) > 0) | ||
44 | err = atoi(id); | ||
45 | close(fd); | ||
46 | } | ||
47 | |||
48 | free(filename); | ||
49 | return err; | ||
50 | } | ||
51 | |||
52 | static int test__open_syscall_event(void) | ||
53 | { | ||
54 | int err = -1, fd; | ||
55 | struct thread_map *threads; | ||
56 | struct perf_evsel *evsel; | ||
57 | struct perf_event_attr attr; | ||
58 | unsigned int nr_open_calls = 111, i; | ||
59 | int id = trace_event__id("sys_enter_open"); | ||
60 | |||
61 | if (id < 0) { | ||
62 | pr_debug("is debugfs mounted on /sys/kernel/debug?\n"); | ||
63 | return -1; | ||
64 | } | ||
65 | |||
66 | threads = thread_map__new(-1, getpid(), UINT_MAX); | ||
67 | if (threads == NULL) { | ||
68 | pr_debug("thread_map__new\n"); | ||
69 | return -1; | ||
70 | } | ||
71 | |||
72 | memset(&attr, 0, sizeof(attr)); | ||
73 | attr.type = PERF_TYPE_TRACEPOINT; | ||
74 | attr.config = id; | ||
75 | evsel = perf_evsel__new(&attr, 0); | ||
76 | if (evsel == NULL) { | ||
77 | pr_debug("perf_evsel__new\n"); | ||
78 | goto out_thread_map_delete; | ||
79 | } | ||
80 | |||
81 | if (perf_evsel__open_per_thread(evsel, threads) < 0) { | ||
82 | pr_debug("failed to open counter: %s, " | ||
83 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", | ||
84 | strerror(errno)); | ||
85 | goto out_evsel_delete; | ||
86 | } | ||
87 | |||
88 | for (i = 0; i < nr_open_calls; ++i) { | ||
89 | fd = open("/etc/passwd", O_RDONLY); | ||
90 | close(fd); | ||
91 | } | ||
92 | |||
93 | if (perf_evsel__read_on_cpu(evsel, 0, 0) < 0) { | ||
94 | pr_debug("perf_evsel__read_on_cpu\n"); | ||
95 | goto out_close_fd; | ||
96 | } | ||
97 | |||
98 | if (evsel->counts->cpu[0].val != nr_open_calls) { | ||
99 | pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls, got %" PRIu64 "\n", | ||
100 | nr_open_calls, evsel->counts->cpu[0].val); | ||
101 | goto out_close_fd; | ||
102 | } | ||
103 | |||
104 | err = 0; | ||
105 | out_close_fd: | ||
106 | perf_evsel__close_fd(evsel, 1, threads->nr); | ||
107 | out_evsel_delete: | ||
108 | perf_evsel__delete(evsel); | ||
109 | out_thread_map_delete: | ||
110 | thread_map__delete(threads); | ||
111 | return err; | ||
112 | } | ||
113 | |||
114 | #include <sched.h> | 30 | #include <sched.h> |
115 | 31 | ||
116 | static int test__open_syscall_event_on_all_cpus(void) | 32 | static int test__open_syscall_event_on_all_cpus(void) |
diff --git a/tools/perf/tests/open-syscall.c b/tools/perf/tests/open-syscall.c new file mode 100644 index 000000000000..98be8b518b4f --- /dev/null +++ b/tools/perf/tests/open-syscall.c | |||
@@ -0,0 +1,66 @@ | |||
1 | #include "thread_map.h" | ||
2 | #include "evsel.h" | ||
3 | #include "debug.h" | ||
4 | #include "tests.h" | ||
5 | |||
6 | int test__open_syscall_event(void) | ||
7 | { | ||
8 | int err = -1, fd; | ||
9 | struct thread_map *threads; | ||
10 | struct perf_evsel *evsel; | ||
11 | struct perf_event_attr attr; | ||
12 | unsigned int nr_open_calls = 111, i; | ||
13 | int id = trace_event__id("sys_enter_open"); | ||
14 | |||
15 | if (id < 0) { | ||
16 | pr_debug("is debugfs mounted on /sys/kernel/debug?\n"); | ||
17 | return -1; | ||
18 | } | ||
19 | |||
20 | threads = thread_map__new(-1, getpid(), UINT_MAX); | ||
21 | if (threads == NULL) { | ||
22 | pr_debug("thread_map__new\n"); | ||
23 | return -1; | ||
24 | } | ||
25 | |||
26 | memset(&attr, 0, sizeof(attr)); | ||
27 | attr.type = PERF_TYPE_TRACEPOINT; | ||
28 | attr.config = id; | ||
29 | evsel = perf_evsel__new(&attr, 0); | ||
30 | if (evsel == NULL) { | ||
31 | pr_debug("perf_evsel__new\n"); | ||
32 | goto out_thread_map_delete; | ||
33 | } | ||
34 | |||
35 | if (perf_evsel__open_per_thread(evsel, threads) < 0) { | ||
36 | pr_debug("failed to open counter: %s, " | ||
37 | "tweak /proc/sys/kernel/perf_event_paranoid?\n", | ||
38 | strerror(errno)); | ||
39 | goto out_evsel_delete; | ||
40 | } | ||
41 | |||
42 | for (i = 0; i < nr_open_calls; ++i) { | ||
43 | fd = open("/etc/passwd", O_RDONLY); | ||
44 | close(fd); | ||
45 | } | ||
46 | |||
47 | if (perf_evsel__read_on_cpu(evsel, 0, 0) < 0) { | ||
48 | pr_debug("perf_evsel__read_on_cpu\n"); | ||
49 | goto out_close_fd; | ||
50 | } | ||
51 | |||
52 | if (evsel->counts->cpu[0].val != nr_open_calls) { | ||
53 | pr_debug("perf_evsel__read_on_cpu: expected to intercept %d calls, got %" PRIu64 "\n", | ||
54 | nr_open_calls, evsel->counts->cpu[0].val); | ||
55 | goto out_close_fd; | ||
56 | } | ||
57 | |||
58 | err = 0; | ||
59 | out_close_fd: | ||
60 | perf_evsel__close_fd(evsel, 1, threads->nr); | ||
61 | out_evsel_delete: | ||
62 | perf_evsel__delete(evsel); | ||
63 | out_thread_map_delete: | ||
64 | thread_map__delete(threads); | ||
65 | return err; | ||
66 | } | ||
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index 2223de5ad299..bac133e15bbd 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h | |||
@@ -1,6 +1,11 @@ | |||
1 | #ifndef TESTS_H | 1 | #ifndef TESTS_H |
2 | #define TESTS_H | 2 | #define TESTS_H |
3 | 3 | ||
4 | /* Tests */ | ||
4 | int test__vmlinux_matches_kallsyms(void); | 5 | int test__vmlinux_matches_kallsyms(void); |
6 | int test__open_syscall_event(void); | ||
7 | |||
8 | /* Util */ | ||
9 | int trace_event__id(const char *evname); | ||
5 | 10 | ||
6 | #endif /* TESTS_H */ | 11 | #endif /* TESTS_H */ |
diff --git a/tools/perf/tests/util.c b/tools/perf/tests/util.c new file mode 100644 index 000000000000..748f2e8f6961 --- /dev/null +++ b/tools/perf/tests/util.c | |||
@@ -0,0 +1,30 @@ | |||
1 | #include <stdio.h> | ||
2 | #include <unistd.h> | ||
3 | #include <stdlib.h> | ||
4 | #include <sys/types.h> | ||
5 | #include <sys/stat.h> | ||
6 | #include <fcntl.h> | ||
7 | #include "tests.h" | ||
8 | #include "debugfs.h" | ||
9 | |||
10 | int trace_event__id(const char *evname) | ||
11 | { | ||
12 | char *filename; | ||
13 | int err = -1, fd; | ||
14 | |||
15 | if (asprintf(&filename, | ||
16 | "%s/syscalls/%s/id", | ||
17 | tracing_events_path, evname) < 0) | ||
18 | return -1; | ||
19 | |||
20 | fd = open(filename, O_RDONLY); | ||
21 | if (fd >= 0) { | ||
22 | char id[16]; | ||
23 | if (read(fd, id, sizeof(id)) > 0) | ||
24 | err = atoi(id); | ||
25 | close(fd); | ||
26 | } | ||
27 | |||
28 | free(filename); | ||
29 | return err; | ||
30 | } | ||