LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Tom Zanussi <zanussi@kernel.org>,
	Daniel Bristot de Oliveira <bristot@redhat.com>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	linux-rt-users <linux-rt-users@vger.kernel.org>,
	Clark Williams <williams@redhat.com>,
	"Steven Rostedt (VMware)" <rostedt@goodmis.org>
Subject: [PATCH 16/17] libtracefs: Add error message for bad filters in SQL statement
Date: Fri, 30 Jul 2021 18:18:23 -0400	[thread overview]
Message-ID: <20210730221824.595597-17-rostedt@goodmis.org> (raw)
In-Reply-To: <20210730221824.595597-1-rostedt@goodmis.org>

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

If a filter has a bad event, or incompatibility with the value assigned to
it, have the error message display it.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 src/tracefs-sqlhist.c | 80 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/tracefs-sqlhist.c b/src/tracefs-sqlhist.c
index 1767c33d77d0..f191661610c9 100644
--- a/src/tracefs-sqlhist.c
+++ b/src/tracefs-sqlhist.c
@@ -792,14 +792,80 @@ static int verify_filter(struct sqlhist_bison *sb, struct filter *filter,
 	}
 }
 
-static int build_filter(struct tracefs_synth *synth,
-			bool start, struct filter *filter, bool *started)
+static int test_field_exists(struct tep_handle *tep, struct sqlhist_bison *sb,
+			     struct expr *expr);
+
+static void filter_compare_error(struct tep_handle *tep,
+				 struct sqlhist_bison *sb,
+				 struct expr *expr)
+{
+	struct field *field = &expr->field;
+
+	switch (errno) {
+	case ENODEV:
+	case EBADE:
+		break;
+	case EINVAL:
+		parse_error(sb, field->raw, "Invalid compare\n");
+		break;
+	default:
+		parse_error(sb, field->raw, "System error?\n");
+		return;
+	}
+
+	/* ENODEV means that an event or field does not exist */
+	if (errno == ENODEV) {
+		if (test_field_exists(tep, sb, expr))
+			return;
+		if (test_field_exists(tep, sb, expr))
+			return;
+		return;
+	}
+
+	/* fields exist, but values are not compatible */
+	sb->line_no = expr->line;
+	sb->line_idx = expr->idx;
+
+	parse_error(sb, field->raw,
+		    "Field '%s' is not compatible to be compared with the given value\n",
+		    field->field);
+}
+
+static void filter_error(struct tep_handle *tep,
+			 struct sqlhist_bison *sb, struct expr *expr)
+{
+	struct filter *filter = &expr->filter;
+
+	sb->line_no = expr->line;
+	sb->line_idx = expr->idx;
+
+	switch (filter->type) {
+	case FILTER_NOT_GROUP:
+	case FILTER_GROUP:
+	case FILTER_OR:
+	case FILTER_AND:
+		break;
+	default:
+		filter_compare_error(tep, sb, filter->lval);
+		return;
+	}
+
+	sb->line_no = expr->line;
+	sb->line_idx = expr->idx;
+
+	parse_error(sb, "", "Problem with filter entry?\n");
+}
+
+static int build_filter(struct tep_handle *tep, struct sqlhist_bison *sb,
+			struct tracefs_synth *synth,
+			bool start, struct expr *expr, bool *started)
 {
 	int (*append_filter)(struct tracefs_synth *synth,
 			     enum tracefs_filter type,
 			     const char *field,
 			     enum tracefs_compare compare,
 			     const char *val);
+	struct filter *filter = &expr->filter;
 	enum tracefs_compare cmp;
 	const char *val;
 	int and_or = TRACEFS_FILTER_AND;
@@ -829,7 +895,7 @@ static int build_filter(struct tracefs_synth *synth,
 				    NULL, 0, NULL);
 		if (ret < 0)
 			goto out;
-		ret = build_filter(synth, start, &filter->lval->filter, NULL);
+		ret = build_filter(tep, sb, synth, start, filter->lval, NULL);
 		if (ret < 0)
 			goto out;
 		ret = append_filter(synth, TRACEFS_FILTER_CLOSE_PAREN,
@@ -840,14 +906,14 @@ static int build_filter(struct tracefs_synth *synth,
 		and_or = TRACEFS_FILTER_OR;
 		/* Fall through */
 	case FILTER_AND:
-		ret = build_filter(synth, start, &filter->lval->filter, NULL);
+		ret = build_filter(tep, sb, synth, start, filter->lval, NULL);
 		if (ret < 0)
 			goto out;
 		ret = append_filter(synth, and_or, NULL, 0, NULL);
 
 		if (ret)
 			goto out;
-		ret = build_filter(synth, start, &filter->rval->filter, NULL);
+		ret = build_filter(tep, sb, synth, start, filter->rval, NULL);
 		goto out;
 	default:
 		break;
@@ -881,6 +947,8 @@ static int build_filter(struct tracefs_synth *synth,
 	ret = append_filter(synth, TRACEFS_FILTER_COMPARE,
 			    filter->lval->field.field, cmp, val);
 
+	if (ret)
+		filter_error(tep, sb, expr);
  out:
 	if (!ret && started) {
 		if (*started)
@@ -1145,7 +1213,7 @@ static struct tracefs_synth *build_synth(struct tep_handle *tep,
 		else
 			started = &started_end;
 
-		ret = build_filter(synth, start, &expr->filter, started);
+		ret = build_filter(tep, table->sb, synth, start, expr, started);
 		if (ret < 0)
 			goto free;
 	}
-- 
2.30.2


  parent reply	other threads:[~2021-07-30 22:19 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-30 22:18 [PATCH 00/17] libtracefs: Introducing tracefs_sql() to create synthetice events with an SQL line Steven Rostedt
2021-07-30 22:18 ` [PATCH 01/17] libtracefs: Added new API tracefs_sql() Steven Rostedt
2021-08-01  6:32   ` Ahmed S. Darwish
2021-08-01 22:10     ` Steven Rostedt
2021-08-02 23:45   ` Namhyung Kim
2021-08-03  2:49     ` Steven Rostedt
2021-07-30 22:18 ` [PATCH 02/17] tracefs: Add unit tests for tracefs_sql() Steven Rostedt
2021-07-30 22:18 ` [PATCH 03/17] libtracefs: Add comparing start and end fields in tracefs_sql() Steven Rostedt
2021-07-30 22:18 ` [PATCH 04/17] libtracefs: Add unit test to test tracefs_sql() compare Steven Rostedt
2021-07-30 22:18 ` [PATCH 05/17] libtracefs: Add filtering for start and end events in tracefs_sql() Steven Rostedt
2021-07-30 22:18 ` [PATCH 06/17] libtracefs: Add unit test to test tracefs_sql() where clause Steven Rostedt
2021-07-30 22:18 ` [PATCH 07/17] libtracefs: Make sqlhist parser reentrant Steven Rostedt
2021-07-30 22:18 ` [PATCH 08/17] libtracefs: Make parser unique to libtracefs Steven Rostedt
2021-07-30 22:18 ` [PATCH 09/17] libtracefs: Add line number and index to expr structure Steven Rostedt
2021-07-30 22:18 ` [PATCH 10/17] libtracefs: Add a parse_error() helper function to record errors Steven Rostedt
2021-07-30 22:18 ` [PATCH 11/17] libtracefs: Add error message when match fields are not FROM and JOIN events Steven Rostedt
2021-07-30 22:18 ` [PATCH 12/17] libtracefs: Add error message when match or init fails from bad events Steven Rostedt
2021-07-30 22:18 ` [PATCH 13/17] libtracefs; Add error message for bad selections to SQL sequence Steven Rostedt
2021-07-30 22:18 ` [PATCH 14/17] libtracefs: Add error message when compare fields fail Steven Rostedt
2021-07-30 22:18 ` [PATCH 15/17] libtracefs: Add error message for grouping events in SQL filter Steven Rostedt
2021-07-30 22:18 ` Steven Rostedt [this message]
2021-07-30 22:18 ` [PATCH 17/17] libtracefs: Add man page for tracefs_sql() Steven Rostedt
2021-08-01 13:39   ` Ahmed S. Darwish
2021-08-01 22:29     ` Steven Rostedt
2021-08-04 12:27       ` Ahmed S. Darwish
2021-07-30 22:31 ` [PATCH 00/17] libtracefs: Introducing tracefs_sql() to create synthetice events with an SQL line Steven Rostedt

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=20210730221824.595597-17-rostedt@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=bristot@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=williams@redhat.com \
    --cc=zanussi@kernel.org \
    --subject='Re: [PATCH 16/17] libtracefs: Add error message for bad filters in SQL statement' \
    /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

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).