From: Ian Rogers <irogers@google.com>
To: "Peter Zijlstra" <peterz@infradead.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Jiri Olsa" <jolsa@kernel.org>, "Ian Rogers" <irogers@google.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Kan Liang" <kan.liang@linux.intel.com>,
"John Garry" <john.g.garry@oracle.com>,
"Will Deacon" <will@kernel.org>,
"James Clark" <james.clark@linaro.org>,
"Mike Leach" <mike.leach@linaro.org>,
"Leo Yan" <leo.yan@linux.dev>,
"Ravi Bangoria" <ravi.bangoria@amd.com>,
"Weilin Wang" <weilin.wang@intel.com>,
"Jing Zhang" <renyu.zj@linux.alibaba.com>,
"Xu Yang" <xu.yang_2@nxp.com>,
"Sandipan Das" <sandipan.das@amd.com>,
"Benjamin Gray" <bgray@linux.ibm.com>,
"Athira Jajeev" <atrajeev@linux.vnet.ibm.com>,
"Howard Chu" <howardchu95@gmail.com>,
"Dominique Martinet" <asmadeus@codewreck.org>,
"Yang Jihong" <yangjihong@bytedance.com>,
"Colin Ian King" <colin.i.king@gmail.com>,
"Veronika Molnarova" <vmolnaro@redhat.com>,
"Dr. David Alan Gilbert" <linux@treblig.org>,
"Oliver Upton" <oliver.upton@linux.dev>,
"Changbin Du" <changbin.du@huawei.com>,
"Ze Gao" <zegao2021@gmail.com>, "Andi Kleen" <ak@linux.intel.com>,
"Clément Le Goffic" <clement.legoffic@foss.st.com>,
"Sun Haiyong" <sunhaiyong@loongson.cn>,
"Junhao He" <hejunhao3@huawei.com>,
"Tiezhu Yang" <yangtiezhu@loongson.cn>,
"Yicong Yang" <yangyicong@hisilicon.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 01/13] perf pmu: Simplify an asprintf error message
Date: Thu, 12 Sep 2024 12:03:28 -0700 [thread overview]
Message-ID: <20240912190341.919229-2-irogers@google.com> (raw)
In-Reply-To: <20240912190341.919229-1-irogers@google.com>
Use ifs rather than ?: to avoid a large compound statement.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/pmu.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 61bdda01a05a..779db2ac06f0 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -1466,13 +1466,12 @@ static int pmu_config_term(const struct perf_pmu *pmu,
if (err) {
char *err_str;
- parse_events_error__handle(err, term->err_val,
- asprintf(&err_str,
- "value too big for format (%s), maximum is %llu",
- format->name, (unsigned long long)max_val) < 0
- ? strdup("value too big for format")
- : err_str,
- NULL);
+ if (asprintf(&err_str,
+ "value too big for format (%s), maximum is %llu",
+ format->name, (unsigned long long)max_val) < 0) {
+ err_str = strdup("value too big for format");
+ }
+ parse_events_error__handle(err, term->err_val, err_str, /*help=*/NULL);
return -EINVAL;
}
/*
--
2.46.0.662.g92d0881bb0-goog
next prev parent reply other threads:[~2024-09-12 19:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-12 19:03 [PATCH v2 00/13] Tool and hwmon PMUs Ian Rogers
2024-09-12 19:03 ` Ian Rogers [this message]
2024-09-12 19:18 ` [PATCH v2 01/13] perf pmu: Simplify an asprintf error message Arnaldo Carvalho de Melo
2024-09-12 19:03 ` [PATCH v2 02/13] perf pmu: Allow hardcoded terms to be applied to attributes Ian Rogers
2024-09-12 19:03 ` [PATCH v2 03/13] perf parse-events: Expose/rename config_term_name Ian Rogers
2024-09-12 19:03 ` [PATCH v2 04/13] perf tool_pmu: Factor tool events into their own PMU Ian Rogers
2024-09-12 19:03 ` [PATCH v2 05/13] perf tool_pmu: Rename enum perf_tool_event to tool_pmu_event Ian Rogers
2024-09-12 19:03 ` [PATCH v2 06/13] perf tool_pmu: Rename perf_tool_event__* to tool_pmu__* Ian Rogers
2024-09-12 19:03 ` [PATCH v2 07/13] perf tool_pmu: Move expr literals to tool_pmu Ian Rogers
2024-09-12 19:03 ` [PATCH v2 08/13] perf jevents: Add tool event json under a common architecture Ian Rogers
2024-09-12 19:03 ` [PATCH v2 09/13] perf tool_pmu: Switch to standard pmu functions and json descriptions Ian Rogers
2024-09-12 19:03 ` [PATCH v2 10/13] perf tests: Add tool PMU test Ian Rogers
2024-09-12 19:03 ` [PATCH v2 11/13] perf hwmon_pmu: Add a tool PMU exposing events from hwmon in sysfs Ian Rogers
2024-09-12 19:03 ` [PATCH v2 12/13] perf test: Add hwmon "PMU" test Ian Rogers
2024-09-12 19:03 ` [PATCH v2 13/13] perf docs: Document tool and hwmon events Ian Rogers
2024-09-12 22:50 ` [PATCH v2 00/13] Tool and hwmon PMUs Namhyung Kim
2024-09-13 14:34 ` Ian Rogers
2024-09-26 19:47 ` Ian Rogers
2024-09-27 17:22 ` Namhyung Kim
2024-09-27 18:09 ` Ian Rogers
2024-09-29 7:21 ` Namhyung Kim
2024-10-01 4:56 ` Ian Rogers
2024-10-01 23:39 ` Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240912190341.919229-2-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=asmadeus@codewreck.org \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=bgray@linux.ibm.com \
--cc=changbin.du@huawei.com \
--cc=clement.legoffic@foss.st.com \
--cc=colin.i.king@gmail.com \
--cc=hejunhao3@huawei.com \
--cc=howardchu95@gmail.com \
--cc=james.clark@linaro.org \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux@treblig.org \
--cc=mark.rutland@arm.com \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=renyu.zj@linux.alibaba.com \
--cc=sandipan.das@amd.com \
--cc=sunhaiyong@loongson.cn \
--cc=vmolnaro@redhat.com \
--cc=weilin.wang@intel.com \
--cc=will@kernel.org \
--cc=xu.yang_2@nxp.com \
--cc=yangjihong@bytedance.com \
--cc=yangtiezhu@loongson.cn \
--cc=yangyicong@hisilicon.com \
--cc=zegao2021@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).