From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Michael Petlan <mpetlan@redhat.com>,
Ravi Bangoria <ravi.bangoria@linux.ibm.com>,
Andi Kleen <ak@linux.intel.com>, Kajol Jain <kjain@linux.ibm.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH 5/5] perf expr: Make expr__parse return -1 on error
Date: Fri, 28 Feb 2020 10:36:16 +0100 [thread overview]
Message-ID: <20200228093616.67125-6-jolsa@kernel.org> (raw)
In-Reply-To: <20200228093616.67125-1-jolsa@kernel.org>
To match the error value of the expr__find_other function,
so all exported expr functions return the same values:
0 on success, -1 on error.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/tests/expr.c | 4 ++--
tools/perf/util/expr.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
index 755d73c86c68..28313e59d6f6 100644
--- a/tools/perf/tests/expr.c
+++ b/tools/perf/tests/expr.c
@@ -45,11 +45,11 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
p = "FOO/0";
ret = expr__parse(&val, &ctx, p);
- TEST_ASSERT_VAL("division by zero", ret == 1);
+ TEST_ASSERT_VAL("division by zero", ret == -1);
p = "BAR/";
ret = expr__parse(&val, &ctx, p);
- TEST_ASSERT_VAL("missing operand", ret == 1);
+ TEST_ASSERT_VAL("missing operand", ret == -1);
TEST_ASSERT_VAL("find other",
expr__find_other("FOO + BAR + BAZ + BOZO", "FOO", &other, &num_other) == 0);
diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
index 45b25530db5b..fd192ddf93c1 100644
--- a/tools/perf/util/expr.c
+++ b/tools/perf/util/expr.c
@@ -54,7 +54,7 @@ __expr__parse(double *val, struct parse_ctx *ctx, const char *expr,
int expr__parse(double *final_val, struct parse_ctx *ctx, const char *expr)
{
- return __expr__parse(final_val, ctx, expr, EXPR_PARSE);
+ return __expr__parse(final_val, ctx, expr, EXPR_PARSE) ? -1 : 0;
}
static bool
--
2.24.1
next prev parent reply other threads:[~2020-02-28 9:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 9:36 [PATCHv3 0/5] perf expr: Add flex scanner Jiri Olsa
2020-02-28 9:36 ` [PATCH 1/5] perf expr: Add expr.c object Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` [PATCH 2/5] perf expr: Move expr lexer to flex Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` [PATCH 3/5] perf expr: Increase EXPR_MAX_OTHER Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] perf expr: Increase EXPR_MAX_OTHER to support metrics with more than 15 variables tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` [PATCH 4/5] perf expr: Straighten expr__parse/expr__find_other interface Jiri Olsa
2020-03-19 14:10 ` [tip: perf/core] perf expr: Straighten expr__parse()/expr__find_other() interface tip-bot2 for Jiri Olsa
2020-02-28 9:36 ` Jiri Olsa [this message]
2020-03-19 14:10 ` [tip: perf/core] perf expr: Make expr__parse() return -1 on error tip-bot2 for Jiri Olsa
2020-02-29 12:27 ` [PATCHv3 0/5] perf expr: Add flex scanner Andi Kleen
2020-03-09 13:39 ` Arnaldo Carvalho de Melo
-- strict thread matches above, loose matches on Subject: below --
2020-02-24 8:29 [PATCHv2 " Jiri Olsa
2020-02-24 8:29 ` [PATCH 5/5] perf expr: Make expr__parse return -1 on error Jiri Olsa
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=20200228093616.67125-6-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=ravi.bangoria@linux.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.