From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829AbdH1Saj (ORCPT ); Mon, 28 Aug 2017 14:30:39 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:38774 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751232AbdH1Sah (ORCPT ); Mon, 28 Aug 2017 14:30:37 -0400 X-Google-Smtp-Source: ADKCNb4CycgkhqUxMQ80LrvwBwO/Z0LsvzmqU0hKGpfQFTX/ucPYn6xHZlDDAVmkioNNc1J0TASrKA== From: David Carrillo-Cisneros To: linux-kernel@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Stephane Eranian , Paul Turner , David Carrillo-Cisneros Subject: [PATCH] perf tools: Remove BUG_ON char[] to bool implicit conversions Date: Mon, 28 Aug 2017 11:30:06 -0700 Message-Id: <20170828183006.104367-1-davidcc@google.com> X-Mailer: git-send-email 2.14.1.342.g6490525c54-goog In-Reply-To: <20170828093341.GA15692@krava> References: <20170828093341.GA15692@krava> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When compiling with LLVM, errors like this are shown: builtin-lock.c:46:10: error: implicit conversion turns string literal into bool: 'const char [39]' to 'bool' due to error message implicit conversion into bool. Fix it printing the error message and returning an error when possible. Signed-off-by: David Carrillo-Cisneros --- tools/perf/builtin-lock.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index ff98652484a7..55d3997ce194 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -3,6 +3,7 @@ #include "builtin.h" #include "perf.h" +#include "asm/bug.h" #include "util/evlist.h" #include "util/evsel.h" #include "util/util.h" @@ -147,12 +148,11 @@ static void thread_stat_insert(struct thread_stat *new) p = container_of(*rb, struct thread_stat, rb); parent = *rb; + WARN(new->tid == p->tid, "inserting invalid thread_stat\n"); if (new->tid < p->tid) rb = &(*rb)->rb_left; - else if (new->tid > p->tid) - rb = &(*rb)->rb_right; else - BUG_ON("inserting invalid thread_stat\n"); + rb = &(*rb)->rb_right; } rb_link_node(&new->rb, parent, rb); @@ -457,8 +457,8 @@ static int report_lock_acquire_event(struct perf_evsel *evsel, free(seq); goto end; default: - BUG_ON("Unknown state of lock sequence found!\n"); - break; + pr_err("Unknown state of lock sequence found!\n"); + return -1; } ls->nr_acquire++; @@ -518,8 +518,8 @@ static int report_lock_acquired_event(struct perf_evsel *evsel, free(seq); goto end; default: - BUG_ON("Unknown state of lock sequence found!\n"); - break; + pr_err("Unknown state of lock sequence found!\n"); + return -1; } seq->state = SEQ_STATE_ACQUIRED; @@ -573,8 +573,8 @@ static int report_lock_contended_event(struct perf_evsel *evsel, free(seq); goto end; default: - BUG_ON("Unknown state of lock sequence found!\n"); - break; + pr_err("Unknown state of lock sequence found!\n"); + return -1; } seq->state = SEQ_STATE_CONTENDED; @@ -632,8 +632,8 @@ static int report_lock_release_event(struct perf_evsel *evsel, bad_hist[BROKEN_RELEASE]++; goto free_seq; default: - BUG_ON("Unknown state of lock sequence found!\n"); - break; + pr_err("Unknown state of lock sequence found!\n"); + return -1; } ls->nr_release++; -- 2.14.1.342.g6490525c54-goog