aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-annotate.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2009-10-17 02:43:17 -0400
committerIngo Molnar <mingo@elte.hu>2009-10-17 03:29:10 -0400
commitf39cdf25bf77219676ec5360980ac40b1a7e144a (patch)
tree2143a3653933efc5ffacea647ce8be72952b3a44 /tools/perf/builtin-annotate.c
parent434a83c3fbb951908a3a52040f7f0e0b8ba00dd0 (diff)
perf tools: Move dereference after NULL test
In each case, if the NULL test on thread is needed, then the dereference should be after the NULL test. A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/): // <smpl> @match exists@ expression x, E; identifier fld; @@ * x->fld ... when != \(x = E\|&x\) * x == NULL // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> LKML-Reference: <Pine.LNX.4.64.0910170842500.9213@ask.diku.dk> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
-rw-r--r--tools/perf/builtin-annotate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 3fe0de03004d..56ba71658d70 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -104,14 +104,14 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
104 event->ip.pid, 104 event->ip.pid,
105 (void *)(long)ip); 105 (void *)(long)ip);
106 106
107 dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid);
108
109 if (thread == NULL) { 107 if (thread == NULL) {
110 fprintf(stderr, "problem processing %d event, skipping it.\n", 108 fprintf(stderr, "problem processing %d event, skipping it.\n",
111 event->header.type); 109 event->header.type);
112 return -1; 110 return -1;
113 } 111 }
114 112
113 dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid);
114
115 if (event->header.misc & PERF_RECORD_MISC_KERNEL) { 115 if (event->header.misc & PERF_RECORD_MISC_KERNEL) {
116 level = 'k'; 116 level = 'k';
117 sym = kernel_maps__find_symbol(ip, &map); 117 sym = kernel_maps__find_symbol(ip, &map);