From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752511AbdGAIv7 (ORCPT ); Sat, 1 Jul 2017 04:51:59 -0400 Received: from terminus.zytor.com ([65.50.211.136]:43587 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751846AbdGAIv5 (ORCPT ); Sat, 1 Jul 2017 04:51:57 -0400 Date: Sat, 1 Jul 2017 01:49:25 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, dsahern@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@kernel.org, wangnan0@huawei.com, namhyung@kernel.org, mingo@kernel.org, acme@redhat.com, hpa@zytor.com Reply-To: acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@kernel.org, wangnan0@huawei.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Kill die() Git-Commit-ID: fef2a735167a827a65bbdf1791abe0dd070ce372 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fef2a735167a827a65bbdf1791abe0dd070ce372 Gitweb: http://git.kernel.org/tip/fef2a735167a827a65bbdf1791abe0dd070ce372 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 27 Jun 2017 11:49:13 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 27 Jun 2017 11:49:13 -0300 perf tools: Kill die() Finally can nuke this function, no more users. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-eivvvzn8ie6w42gy3batxoy7@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/attr.c | 10 +++++----- tools/perf/util/usage.c | 22 ---------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c index 0dd77494..0e77b2c 100644 --- a/tools/perf/tests/attr.c +++ b/tools/perf/tests/attr.c @@ -18,6 +18,7 @@ * permissions. All the event text files are stored there. */ +#include #include #include #include @@ -29,14 +30,11 @@ #include #include #include "../perf.h" -#include "util.h" #include #include "tests.h" #define ENV "PERF_TEST_ATTR" -extern int verbose; - static char *dir; void test_attr__init(void) @@ -138,8 +136,10 @@ void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu, { int errno_saved = errno; - if (store_event(attr, pid, cpu, fd, group_fd, flags)) - die("test attr FAILED"); + if (store_event(attr, pid, cpu, fd, group_fd, flags)) { + pr_err("test attr FAILED"); + exit(128); + } errno = errno_saved; } diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c index bf185f2..6cc9d98 100644 --- a/tools/perf/util/usage.c +++ b/tools/perf/util/usage.c @@ -9,25 +9,12 @@ #include "util.h" #include "debug.h" -static void report(const char *prefix, const char *err, va_list params) -{ - char msg[1024]; - vsnprintf(msg, sizeof(msg), err, params); - fprintf(stderr, " %s%s\n", prefix, msg); -} - static __noreturn void usage_builtin(const char *err) { fprintf(stderr, "\n Usage: %s\n", err); exit(129); } -static __noreturn void die_builtin(const char *err, va_list params) -{ - report(" Fatal: ", err, params); - exit(128); -} - /* If we are in a dlopen()ed .so write to a global variable would segfault * (ugh), so keep things static. */ static void (*usage_routine)(const char *err) __noreturn = usage_builtin; @@ -36,12 +23,3 @@ void usage(const char *err) { usage_routine(err); } - -void die(const char *err, ...) -{ - va_list params; - - va_start(params, err); - die_builtin(err, params); - va_end(params); -}