lkml.org 
[lkml]   [2013]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 080/161] perf lock: Return proper code in report_lock_*_event
Date
From: Davidlohr Bueso <davidlohr@hp.com>

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>
---
tools/perf/builtin-lock.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index 148f7e28ade7..d3188629cbaf 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -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:
--
1.8.1.4


\
 
 \ /
  Last update: 2013-10-15 01:21    [W:0.437 / U:1.312 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site