X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=921db6f598fb30195398750f9a906e355e36707e;hp=272c70299b089fe79fda1ab17369f10d69eb9b26;hb=347c5ab5500e49fcd356a7e000f44ebce633e1d4;hpb=8eb7a5e2b9006c5f675c3809055e8abcdffcdb6f

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 272c70299..921db6f59 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -687,6 +687,62 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle,
 			filter_expression, 0, NULL);
 }
 
+/*
+ * Depending on the event, return a newly allocated JUL filter expression or
+ * NULL if not applicable.
+ *
+ * An event with NO loglevel and the name is * will return NULL.
+ */
+static char *set_jul_filter(const char *filter, struct lttng_event *ev)
+{
+	int err;
+	char *jul_filter = NULL;
+
+	assert(ev);
+
+	/* Don't add filter for the '*' event. */
+	if (ev->name[0] != '*') {
+		if (filter) {
+			err = asprintf(&jul_filter, "%s && logger_name == \"%s\"", filter,
+					ev->name);
+		} else {
+			err = asprintf(&jul_filter, "logger_name == \"%s\"", ev->name);
+		}
+		if (err < 0) {
+			PERROR("asprintf");
+			goto end;
+		}
+	}
+
+	/* Add loglevel filtering if any for the JUL domain. */
+	if (ev->loglevel_type != LTTNG_EVENT_LOGLEVEL_ALL) {
+		char *op;
+
+		if (ev->loglevel_type == LTTNG_EVENT_LOGLEVEL_RANGE) {
+			op = ">=";
+		} else {
+			op = "==";
+		}
+
+		if (filter) {
+			err = asprintf(&jul_filter, "%s && int_loglevel %s %d", filter, op,
+					ev->loglevel);
+		} else {
+			err = asprintf(&jul_filter, "int_loglevel %s %d", op,
+					ev->loglevel);
+		}
+		if (err < 0) {
+			PERROR("asprintf");
+			free(jul_filter);
+			jul_filter = NULL;
+			goto end;
+		}
+	}
+
+end:
+	return jul_filter;
+}
+
 /*
  * Enable event(s) for a channel, possibly with exclusions and a filter.
  * If no event name is specified, all events are enabled.
@@ -749,9 +805,8 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	 * filtering by logger name.
 	 */
 	if (exclusion_count == 0 && filter_expression == NULL &&
-			(handle->domain.type != LTTNG_DOMAIN_JUL || ev->name[0] == '*')) {
-		ret = lttng_ctl_ask_sessiond(&lsm, NULL);
-		return ret;
+			handle->domain.type != LTTNG_DOMAIN_JUL) {
+		goto ask_sessiond;
 	}
 
 	/*
@@ -760,22 +815,13 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	 */
 
 	/* Parse filter expression */
-	if (filter_expression != NULL ||
-			(handle->domain.type == LTTNG_DOMAIN_JUL && ev->name[0] != '*')) {
+	if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL) {
 		if (handle->domain.type == LTTNG_DOMAIN_JUL) {
-			int err;
-
-			if (filter_expression) {
-				err = asprintf(&jul_filter, "%s && logger_name == \"%s\"",
-						filter_expression, ev->name);
-			} else {
-				err = asprintf(&jul_filter, "logger_name == \"%s\"", ev->name);
+			/* Setup JUL filter if needed. */
+			filter_expression = set_jul_filter(filter_expression, ev);
+			if (!filter_expression) {
+				goto ask_sessiond;
 			}
-			if (err < 0) {
-				PERROR("asprintf");
-				return -LTTNG_ERR_NOMEM;
-			}
-			filter_expression = jul_filter;
 		}
 
 		/*
@@ -910,6 +956,10 @@ filter_alloc_error:
 	}
 	free(jul_filter);
 	return ret;
+
+ask_sessiond:
+	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
+	return ret;
 }
 
 /*