Fix: JUL filtering done on the UST level

[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 756fd6b590ef80bd89c7f8fabbdf67f765d4e135..38fe271b09b6ee4e112d8080f40c4b886a2786e8 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;
@@ -756,9 +749,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;
        }
 
        /*
@@ -767,22 +759,52 @@ 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);
+                       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;
                        }
-                       if (err < 0) {
-                               PERROR("asprintf");
-                               return -LTTNG_ERR_NOMEM;
+
+                       /* 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;
                        }
-                       filter_expression = jul_filter;
                }
 
                /*
@@ -917,6 +939,10 @@ filter_alloc_error:
        }
        free(jul_filter);
        return ret;
+
+ask_sessiond:
+       ret = lttng_ctl_ask_sessiond(&lsm, NULL);
+       return ret;
 }
 
 /*