Fix: move JUL filter creation to a function

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl.c

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 100e587d9e206905b1327bfd790f5b8f1888a8ac..921db6f598fb30195398750f9a906e355e36707e 100644 (file)
--- 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;
@@ -694,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.
@@ -708,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;
+       char *varlen_data, *jul_filter = NULL;
        int ret = 0;
        struct filter_parser_ctx *ctx = NULL;
        FILE *fmem = NULL;
@@ -750,9 +799,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 +815,14 @@ 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) {
+                       /* Setup JUL filter if needed. */
+                       filter_expression = set_jul_filter(filter_expression, ev);
+                       if (!filter_expression) {
+                               goto ask_sessiond;
+                       }
+               }
 
                /*
                 * casting const to non-const, as the underlying function will
@@ -771,6 +832,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 +943,7 @@ varlen_alloc_error:
                        perror("fclose");
                }
        }
+       free(jul_filter);
        return ret;
 
 parse_error:
@@ -891,6 +954,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;
 }