X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=38fe271b09b6ee4e112d8080f40c4b886a2786e8;hp=3f6635e8f759c751d11f3d5402452ca9f7d37aeb;hb=3e1c9ff7804bbdb8fd223a9d2453bcc5ff291aa3;hpb=6565421fd1e3307cda0f3cb0f849cb990122edc7 diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c index 3f6635e8f..38fe271b0 100644 --- a/src/lib/lttng-ctl/lttng-ctl.c +++ b/src/lib/lttng-ctl/lttng-ctl.c @@ -520,6 +520,7 @@ int lttng_register_consumer(struct lttng_handle *handle, return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_REGISTER_CONSUMER; lttng_ctl_copy_string(lsm.session.name, handle->session_name, sizeof(lsm.session.name)); @@ -542,6 +543,7 @@ int lttng_start_tracing(const char *session_name) return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_START_TRACE; lttng_ctl_copy_string(lsm.session.name, session_name, @@ -562,6 +564,7 @@ static int _lttng_stop_tracing(const char *session_name, int wait) return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_STOP_TRACE; lttng_ctl_copy_string(lsm.session.name, session_name, @@ -576,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); @@ -594,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; @@ -705,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; @@ -747,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; } /* @@ -758,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 @@ -768,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); @@ -831,40 +879,43 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle, lsm.u.enable.bytecode_len = sizeof(ctx->bytecode->b) + bytecode_get_len(&ctx->bytecode->b); - } - - /* Allocate variable length data */ - if (lsm.u.enable.exclusion_count != 0) { - varlen_data = zmalloc(lsm.u.enable.bytecode_len - + LTTNG_SYMBOL_NAME_LEN * exclusion_count); - if (!varlen_data) { - ret = -LTTNG_ERR_EXCLUSION_NOMEM; - goto varlen_alloc_error; - } - /* Put exclusion names first in the data */ - while (exclusion_count--) { - strncpy(varlen_data + LTTNG_SYMBOL_NAME_LEN * exclusion_count, - *(exclusion_list + exclusion_count), - LTTNG_SYMBOL_NAME_LEN); - } - /* Add filter bytecode next */ - if (lsm.u.enable.bytecode_len != 0) { - memcpy(varlen_data + LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count, - &ctx->bytecode->b, - lsm.u.enable.bytecode_len); - } - } else { - /* no exclusions - use the already allocated filter bytecode */ - varlen_data = (char *)(&ctx->bytecode->b); + lsm.u.enable.expression_len = strlen(filter_expression) + 1; + } + + varlen_data = zmalloc(lsm.u.enable.bytecode_len + + lsm.u.enable.expression_len + + LTTNG_SYMBOL_NAME_LEN * exclusion_count); + if (!varlen_data) { + ret = -LTTNG_ERR_EXCLUSION_NOMEM; + goto varlen_alloc_error; + } + /* Put exclusion names first in the data */ + while (exclusion_count--) { + strncpy(varlen_data + LTTNG_SYMBOL_NAME_LEN * exclusion_count, + *(exclusion_list + exclusion_count), + LTTNG_SYMBOL_NAME_LEN); + } + /* Add filter expression next */ + if (lsm.u.enable.expression_len != 0) { + memcpy(varlen_data + + LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count, + filter_expression, + lsm.u.enable.expression_len); + } + /* Add filter bytecode next */ + if (lsm.u.enable.bytecode_len != 0) { + memcpy(varlen_data + + LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count + + lsm.u.enable.expression_len, + &ctx->bytecode->b, + lsm.u.enable.bytecode_len); } ret = lttng_ctl_ask_sessiond_varlen(&lsm, varlen_data, (LTTNG_SYMBOL_NAME_LEN * lsm.u.enable.exclusion_count) + - lsm.u.enable.bytecode_len, NULL); - - if (lsm.u.enable.exclusion_count != 0) { - free(varlen_data); - } + lsm.u.enable.bytecode_len + lsm.u.enable.expression_len, + NULL); + free(varlen_data); varlen_alloc_error: if (filter_expression) { @@ -875,6 +926,7 @@ varlen_alloc_error: perror("fclose"); } } + free(jul_filter); return ret; parse_error: @@ -885,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; } @@ -1004,6 +1061,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle, return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_LIST_TRACEPOINTS; lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain); @@ -1031,6 +1089,7 @@ int lttng_list_tracepoint_fields(struct lttng_handle *handle, return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_LIST_TRACEPOINT_FIELDS; lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain); @@ -1099,6 +1158,7 @@ int lttng_destroy_session(const char *session_name) return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_DESTROY_SESSION; lttng_ctl_copy_string(lsm.session.name, session_name, @@ -1118,6 +1178,7 @@ int lttng_list_sessions(struct lttng_session **sessions) int ret; struct lttcomm_session_msg lsm; + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_LIST_SESSIONS; ret = lttng_ctl_ask_sessiond(&lsm, (void**) sessions); if (ret < 0) { @@ -1143,6 +1204,7 @@ int lttng_list_domains(const char *session_name, return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_LIST_DOMAINS; lttng_ctl_copy_string(lsm.session.name, session_name, @@ -1172,6 +1234,7 @@ int lttng_list_channels(struct lttng_handle *handle, return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_LIST_CHANNELS; lttng_ctl_copy_string(lsm.session.name, handle->session_name, sizeof(lsm.session.name)); @@ -1203,6 +1266,7 @@ int lttng_list_events(struct lttng_handle *handle, return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_LIST_EVENTS; lttng_ctl_copy_string(lsm.session.name, handle->session_name, sizeof(lsm.session.name)); @@ -1250,6 +1314,7 @@ int lttng_calibrate(struct lttng_handle *handle, return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_CALIBRATE; lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain); @@ -1480,6 +1545,7 @@ int lttng_data_pending(const char *session_name) return -LTTNG_ERR_INVALID; } + memset(&lsm, 0, sizeof(lsm)); lsm.cmd_type = LTTNG_DATA_PENDING; lttng_ctl_copy_string(lsm.session.name, session_name, @@ -1557,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;