summaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-lock.c
diff options
context:
space:
mode:
authorDavidlohr Bueso <davidlohr@hp.com>2013-09-08 22:19:14 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-10-09 10:23:32 -0400
commitb33492ade49a223a666e582d0c63566609e7014b (patch)
treec1708b0d19a8d1acdce8f5560b6a4575a836ef57 /tools/perf/builtin-lock.c
parent02ad0702e54f9b82b697718e7e8662eb3f2266ee (diff)
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>
Diffstat (limited to 'tools/perf/builtin-lock.c')
-rw-r--r--tools/perf/builtin-lock.c24
1 files 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,
400 400
401 ls = lock_stat_findnew(addr, name); 401 ls = lock_stat_findnew(addr, name);
402 if (!ls) 402 if (!ls)
403 return -1; 403 return -ENOMEM;
404 if (ls->discard) 404 if (ls->discard)
405 return 0; 405 return 0;
406 406
407 ts = thread_stat_findnew(sample->tid); 407 ts = thread_stat_findnew(sample->tid);
408 if (!ts) 408 if (!ts)
409 return -1; 409 return -ENOMEM;
410 410
411 seq = get_seq(ts, addr); 411 seq = get_seq(ts, addr);
412 if (!seq) 412 if (!seq)
413 return -1; 413 return -ENOMEM;
414 414
415 switch (seq->state) { 415 switch (seq->state) {
416 case SEQ_STATE_UNINITIALIZED: 416 case SEQ_STATE_UNINITIALIZED:
@@ -472,17 +472,17 @@ static int report_lock_acquired_event(struct perf_evsel *evsel,
472 472
473 ls = lock_stat_findnew(addr, name); 473 ls = lock_stat_findnew(addr, name);
474 if (!ls) 474 if (!ls)
475 return -1; 475 return -ENOMEM;
476 if (ls->discard) 476 if (ls->discard)
477 return 0; 477 return 0;
478 478
479 ts = thread_stat_findnew(sample->tid); 479 ts = thread_stat_findnew(sample->tid);
480 if (!ts) 480 if (!ts)
481 return -1; 481 return -ENOMEM;
482 482
483 seq = get_seq(ts, addr); 483 seq = get_seq(ts, addr);
484 if (!seq) 484 if (!seq)
485 return -1; 485 return -ENOMEM;
486 486
487 switch (seq->state) { 487 switch (seq->state) {
488 case SEQ_STATE_UNINITIALIZED: 488 case SEQ_STATE_UNINITIALIZED:
@@ -533,17 +533,17 @@ static int report_lock_contended_event(struct perf_evsel *evsel,
533 533
534 ls = lock_stat_findnew(addr, name); 534 ls = lock_stat_findnew(addr, name);
535 if (!ls) 535 if (!ls)
536 return -1; 536 return -ENOMEM;
537 if (ls->discard) 537 if (ls->discard)
538 return 0; 538 return 0;
539 539
540 ts = thread_stat_findnew(sample->tid); 540 ts = thread_stat_findnew(sample->tid);
541 if (!ts) 541 if (!ts)
542 return -1; 542 return -ENOMEM;
543 543
544 seq = get_seq(ts, addr); 544 seq = get_seq(ts, addr);
545 if (!seq) 545 if (!seq)
546 return -1; 546 return -ENOMEM;
547 547
548 switch (seq->state) { 548 switch (seq->state) {
549 case SEQ_STATE_UNINITIALIZED: 549 case SEQ_STATE_UNINITIALIZED:
@@ -587,17 +587,17 @@ static int report_lock_release_event(struct perf_evsel *evsel,
587 587
588 ls = lock_stat_findnew(addr, name); 588 ls = lock_stat_findnew(addr, name);
589 if (!ls) 589 if (!ls)
590 return -1; 590 return -ENOMEM;
591 if (ls->discard) 591 if (ls->discard)
592 return 0; 592 return 0;
593 593
594 ts = thread_stat_findnew(sample->tid); 594 ts = thread_stat_findnew(sample->tid);
595 if (!ts) 595 if (!ts)
596 return -1; 596 return -ENOMEM;
597 597
598 seq = get_seq(ts, addr); 598 seq = get_seq(ts, addr);
599 if (!seq) 599 if (!seq)
600 return -1; 600 return -ENOMEM;
601 601
602 switch (seq->state) { 602 switch (seq->state) {
603 case SEQ_STATE_UNINITIALIZED: 603 case SEQ_STATE_UNINITIALIZED: