From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC3E2EB64D9 for ; Thu, 29 Jun 2023 21:49:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231621AbjF2Vtp convert rfc822-to-8bit (ORCPT ); Thu, 29 Jun 2023 17:49:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbjF2Vtl (ORCPT ); Thu, 29 Jun 2023 17:49:41 -0400 Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01A2730C4; Thu, 29 Jun 2023 14:49:40 -0700 (PDT) Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5634d8d1db0so816840eaf.0; Thu, 29 Jun 2023 14:49:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688075380; x=1690667380; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0l23JP6S9GF/LAJfWcHkkcP43ONSxdFrMmfEO7H0kkE=; b=Gk90oRB+UAgMNfNRfbBae4fhx0Mtg0JN+CZujOejRaDwVfEoAn0yqUhYQ/HaJwJmpY QkQp0hkHPtsKbte00flgZBwneXD+hlSLrSHOMRPK4WLALkEwJBbO7fk/wXhF+yBZGRWV ZTQwp6dxQLLk6GTSJLVIf08BI96f9Wa4CT8554OG4qTV7tgDx3NBUSRWrpDbPJJVnQ/H 0mj/YGm4N3VZFJaa1QUBD4dH5TF/hpP6CqRHISeNJ29NxgGoM8FTj04gFyvuQ1jdOe3t fKeef94nKQMtu9j5K3NxlG60Fv0v+/sASlIpafqAAPpLTPk3jpwXZWfYpy15l7wFojaQ Cd9Q== X-Gm-Message-State: ABy/qLaxl1HN7r/FSUDMB3HGixrppHVVnHLqn91AU6b8DUyPdkGkPRtY 4oKbBt1GB4pMC+QSLMugCsH2+y+AJkpe40jNujCYiKiz X-Google-Smtp-Source: APBJJlHlXlntMH5DzeJI8yA4KDyrBXcKEoP2+taRKkbY3XHfuf2wz3KNvVIpxBG8F2/r6sGSfWxsetWTCuw8LQI1VMk= X-Received: by 2002:a05:6358:e907:b0:134:e34e:ec49 with SMTP id gk7-20020a056358e90700b00134e34eec49mr891794rwb.2.1688075380126; Thu, 29 Jun 2023 14:49:40 -0700 (PDT) MIME-Version: 1.0 References: <20230627181030.95608-1-irogers@google.com> <20230627181030.95608-14-irogers@google.com> In-Reply-To: <20230627181030.95608-14-irogers@google.com> From: Namhyung Kim Date: Thu, 29 Jun 2023 14:49:29 -0700 Message-ID: Subject: Re: [PATCH v2 13/13] perf parse-events: Remove ABORT_ON To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Athira Rajeev , Kan Liang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org On Tue, Jun 27, 2023 at 11:11 AM Ian Rogers wrote: > > Prefer informative messages rather than none with ABORT_ON. Document > one failure mode and add an error message for another. > > Signed-off-by: Ian Rogers > --- > tools/perf/util/parse-events.y | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y > index 844646752462..454577f7aff6 100644 > --- a/tools/perf/util/parse-events.y > +++ b/tools/perf/util/parse-events.y > @@ -22,12 +22,6 @@ > > void parse_events_error(YYLTYPE *loc, void *parse_state, void *scanner, char const *msg); > > -#define ABORT_ON(val) \ > -do { \ > - if (val) \ > - YYABORT; \ > -} while (0) > - > #define PE_ABORT(val) \ > do { \ > if (val == -ENOMEM) \ > @@ -618,7 +612,9 @@ PE_RAW opt_event_config > YYNOMEM; > errno = 0; > num = strtoull($1 + 1, NULL, 16); > - ABORT_ON(errno); > + /* Given the lexer will only give [a-fA-F0-9]+ a failure here should be impossible. */ > + if (errno) > + YYABORT; > free($1); > err = parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, num, $2, > /*wildcard=*/false); > @@ -978,7 +974,17 @@ PE_VALUE PE_ARRAY_RANGE PE_VALUE > { > struct parse_events_array array; > > - ABORT_ON($3 < $1); > + if ($3 < $1) { > + struct parse_events_state *parse_state = _parse_state; > + struct parse_events_error *error = parse_state->error; > + char *err_str; > + > + if (asprintf(&err_str, "Expected '%ld' to be less-than '%ld'", $3, $1) < 0) Isn't it to be "greater-than or equal" ? Thanks, Namhyung > + err_str = NULL; > + > + parse_events_error__handle(error, @1.first_column, err_str, NULL); > + YYABORT; > + } > array.nr_ranges = 1; > array.ranges = malloc(sizeof(array.ranges[0])); > if (!array.ranges) > -- > 2.41.0.162.gfafddb0af9-goog >