X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=38fe271b09b6ee4e112d8080f40c4b886a2786e8;hb=3e1c9ff7804bbdb8fd223a9d2453bcc5ff291aa3;hp=8e2593db125acb4f30c0a7e7b076395b685682f3;hpb=6b453b5e07e90591c955ae14c60c13b7c1ed28a0;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 8e2593db1..38fe271b0 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -579,9 +579,6 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
 		goto end;
 	}
 
-	_MSG("Waiting for data availability");
-	fflush(stdout);
-
 	/* Check for data availability */
 	do {
 		data_ret = lttng_data_pending(session_name);
@@ -597,13 +594,9 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
 		 */
 		if (data_ret) {
 			usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
-			_MSG(".");
-			fflush(stdout);
 		}
 	} while (data_ret != 0);
 
-	MSG("");
-
 end:
 error:
 	return ret;
@@ -708,7 +701,7 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 		int exclusion_count, char **exclusion_list)
 {
 	struct lttcomm_session_msg lsm;
-	char *varlen_data;
+	char *varlen_data, *jul_filter = NULL;
 	int ret = 0;
 	struct filter_parser_ctx *ctx = NULL;
 	FILE *fmem = NULL;
@@ -750,9 +743,14 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	lsm.u.enable.exclusion_count = exclusion_count;
 	lsm.u.enable.bytecode_len = 0;
 
-	if (exclusion_count == 0 && filter_expression == NULL) {
-		ret = lttng_ctl_ask_sessiond(&lsm, NULL);
-		return ret;
+	/*
+	 * For the JUL domain, a filter is enforced except for the enable all
+	 * event. This is done to avoid having the event in all sessions thus
+	 * filtering by logger name.
+	 */
+	if (exclusion_count == 0 && filter_expression == NULL &&
+			handle->domain.type != LTTNG_DOMAIN_JUL) {
+		goto ask_sessiond;
 	}
 
 	/*
@@ -761,7 +759,53 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	 */
 
 	/* Parse filter expression */
-	if (filter_expression != NULL) {
+	if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL) {
+		if (handle->domain.type == LTTNG_DOMAIN_JUL) {
+			int err;
+
+			if (ev->name[0] != '*') {
+				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);
+				}
+				if (err < 0) {
+					PERROR("asprintf");
+					return -LTTNG_ERR_NOMEM;
+				}
+				filter_expression = jul_filter;
+			}
+
+			/* 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_expression) {
+					err = asprintf(&jul_filter, "%s && int_loglevel %s %d",
+							filter_expression, op, ev->loglevel);
+				} else {
+					err = asprintf(&jul_filter, "int_loglevel %s %d", op,
+							ev->loglevel);
+				}
+				if (err < 0) {
+					PERROR("asprintf");
+					return -LTTNG_ERR_NOMEM;
+				}
+				filter_expression = jul_filter;
+			}
+
+			if (!filter_expression) {
+				goto ask_sessiond;
+			}
+		}
 
 		/*
 		 * casting const to non-const, as the underlying function will
@@ -771,6 +815,7 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 				strlen(filter_expression), "r");
 		if (!fmem) {
 			fprintf(stderr, "Error opening memory as stream\n");
+			free(jul_filter);
 			return -LTTNG_ERR_FILTER_NOMEM;
 		}
 		ctx = filter_parser_ctx_alloc(fmem);
@@ -881,6 +926,7 @@ varlen_alloc_error:
 			perror("fclose");
 		}
 	}
+	free(jul_filter);
 	return ret;
 
 parse_error:
@@ -891,6 +937,11 @@ filter_alloc_error:
 	if (fclose(fmem) != 0) {
 		perror("fclose");
 	}
+	free(jul_filter);
+	return ret;
+
+ask_sessiond:
+	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
 	return ret;
 }
 
@@ -1572,16 +1623,20 @@ int lttng_create_session_live(const char *name, const char *url,
 	lsm.cmd_type = LTTNG_CREATE_SESSION_LIVE;
 	lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
 
-	size = uri_parse_str_urls(url, NULL, &uris);
-	if (size <= 0) {
-		ret = -LTTNG_ERR_INVALID;
-		goto end;
-	}
+	if (url) {
+		size = uri_parse_str_urls(url, NULL, &uris);
+		if (size <= 0) {
+			ret = -LTTNG_ERR_INVALID;
+			goto end;
+		}
 
-	/* file:// is not accepted for live session. */
-	if (uris[0].dtype == LTTNG_DST_PATH) {
-		ret = -LTTNG_ERR_INVALID;
-		goto end;
+		/* file:// is not accepted for live session. */
+		if (uris[0].dtype == LTTNG_DST_PATH) {
+			ret = -LTTNG_ERR_INVALID;
+			goto end;
+		}
+	} else {
+		size = 0;
 	}
 
 	lsm.u.session_live.nb_uri = size;