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 14/17] libtracefs: Add error message when compare fields fail
Date: Fri, 30 Jul 2021 18:18:21 -0400	[thread overview]
Message-ID: <20210730221824.595597-15-rostedt@goodmis.org> (raw)
In-Reply-To: <20210730221824.595597-1-rostedt@goodmis.org>

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

If the processing of comparing fields fail due to not existing or because
they are not compatible to compare, report a proper error message.

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

diff --git a/src/tracefs-sqlhist.c b/src/tracefs-sqlhist.c
index e542eb95c17f..ff0869232a9e 100644
--- a/src/tracefs-sqlhist.c
+++ b/src/tracefs-sqlhist.c
@@ -981,6 +981,38 @@ static void selection_error(struct tep_handle *tep,
 	test_field_exists(tep, sb, expr);
 }
 
+static void compare_error(struct tep_handle *tep,
+			    struct sqlhist_bison *sb, struct expr *expr)
+{
+	struct compare *compare = &expr->compare;
+
+	switch (errno) {
+	case ENODEV:
+	case EBADE:
+		break;
+	default:
+		/* System error */
+		return;
+	}
+
+	/* ENODEV means that an event or field does not exist */
+	if (errno == ENODEV) {
+		if (test_field_exists(tep, sb, compare->lval))
+			return;
+		if (test_field_exists(tep, sb, compare->rval))
+			return;
+		return;
+	}
+
+	/* fields exist, but values are not compatible */
+	sb->line_no = compare->lval->line;
+	sb->line_idx = compare->lval->idx;
+
+	parse_error(sb, compare->lval->field.raw,
+		    "'%s' is not compatible to compare with '%s'\n",
+		    compare->lval->field.raw, compare->rval->field.raw);
+}
+
 static struct tracefs_synth *build_synth(struct tep_handle *tep,
 					 const char *name,
 					 struct sql_table *table)
@@ -1073,8 +1105,10 @@ static struct tracefs_synth *build_synth(struct tep_handle *tep,
 
 		ret = build_compare(synth, start_system, end_system,
 				    &expr->compare);
-		if (ret < 0)
+		if (ret < 0) {
+			compare_error(tep, table->sb, expr);
 			goto free;
+		}
 	}
 
 	for (expr = table->where; expr; expr = expr->next) {
-- 
2.30.2


  parent reply	other threads:[~2021-07-30 22:20 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 ` Steven Rostedt [this message]
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 ` [PATCH 16/17] libtracefs: Add error message for bad filters in SQL statement Steven Rostedt
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-15-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 14/17] libtracefs: Add error message when compare fields fail' \
    /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).