From 64226865d8a89f843eba2ba1908b0ac50b4d470c Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 26 May 2014 14:01:14 -0400 Subject: [PATCH] Fix: JUL filtering for event * Signed-off-by: David Goulet --- src/lib/lttng-ctl/lttng-ctl.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c index 921db6f59..6363d56b3 100644 --- a/src/lib/lttng-ctl/lttng-ctl.c +++ b/src/lib/lttng-ctl/lttng-ctl.c @@ -757,7 +757,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, *jul_filter = NULL; + char *varlen_data; int ret = 0; struct filter_parser_ctx *ctx = NULL; FILE *fmem = NULL; @@ -817,10 +817,25 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle, /* Parse filter expression */ if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL) { if (handle->domain.type == LTTNG_DOMAIN_JUL) { + char *jul_filter; + /* Setup JUL filter if needed. */ - filter_expression = set_jul_filter(filter_expression, ev); - if (!filter_expression) { - goto ask_sessiond; + jul_filter = set_jul_filter(filter_expression, ev); + if (!jul_filter) { + if (!filter_expression) { + /* No JUL and no filter, just skip everything below. */ + goto ask_sessiond; + } + } else { + /* + * With a JUL filter, the original filter has been added to it + * thus replace the filter expression. + */ + filter_expression = strdup(jul_filter); + free(jul_filter); + if (!filter_expression) { + return -LTTNG_ERR_FILTER_NOMEM; + } } } @@ -832,7 +847,6 @@ 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); @@ -943,7 +957,6 @@ varlen_alloc_error: perror("fclose"); } } - free(jul_filter); return ret; parse_error: @@ -954,7 +967,6 @@ filter_alloc_error: if (fclose(fmem) != 0) { perror("fclose"); } - free(jul_filter); return ret; ask_sessiond: -- 2.34.1