redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

perf lock: Return proper code in report_lock_*_event 

The report_lock_*_event() functions return -1 when lock_stat_findnew(),
thread_stat_findnew() or get_seq() return NULL. These functions only
return this value when failing to allocate memory, this return -ENOMEM
instead.

Signed-off-by: Davidlohr Bueso <davidlohr@hp.com>
Cc: Aswin Chandramouleeswaran <aswin@hp.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1378693159-8747-3-git-send-email-davidlohr@hp.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
hifive-unleashed-5.1
Davidlohr Bueso 2013-09-08 19:19:14 -07:00 committed by Arnaldo Carvalho de Melo
parent 02ad0702e5
commit b33492ade4
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/perf/builtin-lock.c
View File

@ -400,17 +400,17 @@ static int report_lock_acquire_event(struct perf_evsel *evsel,
ls = lock_stat_findnew(addr, name);
if (!ls)
return -1;
return -ENOMEM;
if (ls->discard)
return 0;
ts = thread_stat_findnew(sample->tid);
if (!ts)
return -1;
return -ENOMEM;
seq = get_seq(ts, addr);
if (!seq)
return -1;
return -ENOMEM;
switch (seq->state) {
case SEQ_STATE_UNINITIALIZED:
@ -472,17 +472,17 @@ static int report_lock_acquired_event(struct perf_evsel *evsel,
ls = lock_stat_findnew(addr, name);
if (!ls)
return -1;
return -ENOMEM;
if (ls->discard)
return 0;
ts = thread_stat_findnew(sample->tid);
if (!ts)
return -1;
return -ENOMEM;
seq = get_seq(ts, addr);
if (!seq)
return -1;
return -ENOMEM;
switch (seq->state) {
case SEQ_STATE_UNINITIALIZED:
@ -533,17 +533,17 @@ static int report_lock_contended_event(struct perf_evsel *evsel,
ls = lock_stat_findnew(addr, name);
if (!ls)
return -1;
return -ENOMEM;
if (ls->discard)
return 0;
ts = thread_stat_findnew(sample->tid);
if (!ts)
return -1;
return -ENOMEM;
seq = get_seq(ts, addr);
if (!seq)
return -1;
return -ENOMEM;
switch (seq->state) {
case SEQ_STATE_UNINITIALIZED:
@ -587,17 +587,17 @@ static int report_lock_release_event(struct perf_evsel *evsel,
ls = lock_stat_findnew(addr, name);
if (!ls)
return -1;
return -ENOMEM;
if (ls->discard)
return 0;
ts = thread_stat_findnew(sample->tid);
if (!ts)
return -1;
return -ENOMEM;
seq = get_seq(ts, addr);
if (!seq)
return -1;
return -ENOMEM;
switch (seq->state) {
case SEQ_STATE_UNINITIALIZED: