#include <common/defaults.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/uri.h>
+#include <common/utils.h>
#include <lttng/lttng.h>
+#include <lttng/health-internal.h>
#include "filter/filter-ast.h"
#include "filter/filter-parser.h"
#include "filter/filter-bytecode.h"
#include "filter/memstream.h"
+#include "lttng-ctl-helper.h"
#ifdef DEBUG
static const int print_xml = 1;
/* Socket to session daemon for communication */
static int sessiond_socket;
static char sessiond_sock_path[PATH_MAX];
-static char health_sock_path[PATH_MAX];
/* Variables */
static char *tracing_group;
int lttng_opt_quiet;
int lttng_opt_verbose;
-static void set_default_url_attr(struct lttng_uri *uri,
- enum lttng_stream_type stype)
-{
- uri->stype = stype;
- if (uri->dtype != LTTNG_DST_PATH && uri->port == 0) {
- uri->port = (stype == LTTNG_STREAM_CONTROL) ?
- DEFAULT_NETWORK_CONTROL_PORT : DEFAULT_NETWORK_DATA_PORT;
- }
-}
-
-/*
- * Parse a string URL and creates URI(s) returning the size of the populated
- * array.
- */
-static ssize_t parse_str_urls_to_uri(const char *ctrl_url, const char *data_url,
- struct lttng_uri **uris)
-{
- int ret;
- unsigned int equal = 1, idx = 0;
- /* Add the "file://" size to the URL maximum size */
- char url[PATH_MAX + 7];
- ssize_t size_ctrl = 0, size_data = 0, size;
- struct lttng_uri *ctrl_uris = NULL, *data_uris = NULL;
- struct lttng_uri *tmp_uris = NULL;
-
- /* No URL(s) is allowed. This means that the consumer will be disabled. */
- if (ctrl_url == NULL && data_url == NULL) {
- return 0;
- }
-
- /* Check if URLs are equal and if so, only use the control URL */
- if (ctrl_url && data_url) {
- equal = !strcmp(ctrl_url, data_url);
- }
-
- /*
- * Since we allow the str_url to be a full local filesystem path, we are
- * going to create a valid file:// URL if it's the case.
- *
- * Check if first character is a '/' or else reject the URL.
- */
- if (ctrl_url && ctrl_url[0] == '/') {
- ret = snprintf(url, sizeof(url), "file://%s", ctrl_url);
- if (ret < 0) {
- PERROR("snprintf file url");
- goto parse_error;
- }
- ctrl_url = url;
- }
-
- /* Parse the control URL if there is one */
- if (ctrl_url) {
- size_ctrl = uri_parse(ctrl_url, &ctrl_uris);
- if (size_ctrl < 1) {
- ERR("Unable to parse the URL %s", ctrl_url);
- goto parse_error;
- }
-
- /* At this point, we know there is at least one URI in the array */
- set_default_url_attr(&ctrl_uris[0], LTTNG_STREAM_CONTROL);
-
- if (ctrl_uris[0].dtype == LTTNG_DST_PATH && data_url) {
- ERR("Can not have a data URL when destination is file://");
- goto error;
- }
-
- /* URL are not equal but the control URL uses a net:// protocol */
- if (size_ctrl == 2) {
- if (!equal) {
- ERR("Control URL uses the net:// protocol and the data URL is "
- "different. Not allowed.");
- goto error;
- } else {
- set_default_url_attr(&ctrl_uris[1], LTTNG_STREAM_DATA);
- /*
- * The data_url and ctrl_url are equal and the ctrl_url
- * contains a net:// protocol so we just skip the data part.
- */
- data_url = NULL;
- }
- }
- }
-
- if (data_url) {
- /* We have to parse the data URL in this case */
- size_data = uri_parse(data_url, &data_uris);
- if (size_data < 1) {
- ERR("Unable to parse the URL %s", data_url);
- goto error;
- } else if (size_data == 2) {
- ERR("Data URL can not be set with the net[4|6]:// protocol");
- goto error;
- }
-
- set_default_url_attr(&data_uris[0], LTTNG_STREAM_DATA);
- }
-
- /* Compute total size */
- size = size_ctrl + size_data;
-
- tmp_uris = zmalloc(sizeof(struct lttng_uri) * size);
- if (tmp_uris == NULL) {
- PERROR("zmalloc uris");
- goto error;
- }
-
- if (ctrl_uris) {
- /* It's possible the control URIs array contains more than one URI */
- memcpy(tmp_uris, ctrl_uris, sizeof(struct lttng_uri) * size_ctrl);
- ++idx;
- }
-
- if (data_uris) {
- memcpy(&tmp_uris[idx], data_uris, sizeof(struct lttng_uri));
- }
-
- *uris = tmp_uris;
-
- return size;
-
-error:
- free(ctrl_uris);
- free(data_uris);
- free(tmp_uris);
-parse_error:
- return -1;
-}
-
/*
* Copy string from src to dst and enforce null terminated byte.
*/
-static void copy_string(char *dst, const char *src, size_t len)
+LTTNG_HIDDEN
+void lttng_ctl_copy_string(char *dst, const char *src, size_t len)
{
if (src && dst) {
strncpy(dst, src, len);
*
* If domain is unknown, default domain will be the kernel.
*/
-static void copy_lttng_domain(struct lttng_domain *dst, struct lttng_domain *src)
+LTTNG_HIDDEN
+void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
+ struct lttng_domain *src)
{
if (src && dst) {
switch (src->type) {
case LTTNG_DOMAIN_KERNEL:
case LTTNG_DOMAIN_UST:
- /*
- case LTTNG_DOMAIN_UST_EXEC_NAME:
- case LTTNG_DOMAIN_UST_PID:
- case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
- */
+ case LTTNG_DOMAIN_JUL:
memcpy(dst, src, sizeof(struct lttng_domain));
break;
default:
*
* If yes return 1, else return -1.
*/
-static int check_tracing_group(const char *grp_name)
+LTTNG_HIDDEN
+int lttng_check_tracing_group(void)
{
struct group *grp_tracing; /* no free(). See getgrnam(3) */
gid_t *grp_list;
int grp_list_size, grp_id, i;
int ret = -1;
+ const char *grp_name = tracing_group;
/* Get GID of group 'tracing' */
grp_tracing = getgrnam(grp_name);
*/
static int set_session_daemon_path(void)
{
- int ret;
int in_tgroup = 0; /* In tracing group */
uid_t uid;
if (uid != 0) {
/* Are we in the tracing group ? */
- in_tgroup = check_tracing_group(tracing_group);
+ in_tgroup = lttng_check_tracing_group();
}
if ((uid == 0) || in_tgroup) {
- copy_string(sessiond_sock_path, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK,
- sizeof(sessiond_sock_path));
+ lttng_ctl_copy_string(sessiond_sock_path,
+ DEFAULT_GLOBAL_CLIENT_UNIX_SOCK, sizeof(sessiond_sock_path));
}
if (uid != 0) {
+ int ret;
+
if (in_tgroup) {
/* Tracing group */
ret = try_connect_sessiond(sessiond_sock_path);
* With GNU C >= 2.1, snprintf returns the required size (excluding closing null)
*/
ret = snprintf(sessiond_sock_path, sizeof(sessiond_sock_path),
- DEFAULT_HOME_CLIENT_UNIX_SOCK, getenv("HOME"));
+ DEFAULT_HOME_CLIENT_UNIX_SOCK, utils_get_home_dir());
if ((ret < 0) || (ret >= sizeof(sessiond_sock_path))) {
goto error;
}
{
int ret;
+ /* Don't try to connect if already connected. */
+ if (connected) {
+ return 0;
+ }
+
ret = set_session_daemon_path();
if (ret < 0) {
goto error;
*
* Return size of data (only payload, not header) or a negative error code.
*/
-static int ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
+LTTNG_HIDDEN
+int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
void *vardata, size_t varlen, void **buf)
{
int ret;
return ret;
}
-/*
- * Ask the session daemon a specific command and put the data into buf.
- *
- * Return size of data (only payload, not header) or a negative error code.
- */
-static int ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
-{
- return ask_sessiond_varlen(lsm, NULL, 0, buf);
-}
-
/*
* Create lttng handle and return pointer.
* The returned pointer will be NULL in case of malloc() error.
}
/* Copy session name */
- copy_string(handle->session_name, session_name,
+ lttng_ctl_copy_string(handle->session_name, session_name,
sizeof(handle->session_name));
/* Copy lttng domain */
- copy_lttng_domain(&handle->domain, domain);
+ lttng_ctl_copy_lttng_domain(&handle->domain, domain);
end:
return handle;
*/
void lttng_destroy_handle(struct lttng_handle *handle)
{
- if (handle) {
- free(handle);
- }
+ free(handle);
}
/*
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_REGISTER_CONSUMER;
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- copy_string(lsm.u.reg.path, socket_path, sizeof(lsm.u.reg.path));
+ lttng_ctl_copy_string(lsm.u.reg.path, socket_path, sizeof(lsm.u.reg.path));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_START_TRACE;
- copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
+ lttng_ctl_copy_string(lsm.session.name, session_name,
+ sizeof(lsm.session.name));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_STOP_TRACE;
- copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
+ lttng_ctl_copy_string(lsm.session.name, session_name,
+ sizeof(lsm.session.name));
- ret = ask_sessiond(&lsm, NULL);
+ ret = lttng_ctl_ask_sessiond(&lsm, NULL);
if (ret < 0 && ret != -LTTNG_ERR_TRACE_ALREADY_STOPPED) {
goto error;
}
goto end;
}
- _MSG("Waiting for data availability");
-
/* Check for data availability */
do {
data_ret = lttng_data_pending(session_name);
*/
if (data_ret) {
usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
- _MSG(".");
}
} while (data_ret != 0);
- MSG("");
-
end:
error:
return ret;
lsm.cmd_type = LTTNG_ADD_CONTEXT;
- /* Copy channel name */
- copy_string(lsm.u.context.channel_name, channel_name,
- sizeof(lsm.u.context.channel_name));
+ /* If no channel name, send empty string. */
+ if (channel_name == NULL) {
+ lttng_ctl_copy_string(lsm.u.context.channel_name, "",
+ sizeof(lsm.u.context.channel_name));
+ } else {
+ lttng_ctl_copy_string(lsm.u.context.channel_name, channel_name,
+ sizeof(lsm.u.context.channel_name));
+ }
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
*/
int lttng_enable_event(struct lttng_handle *handle,
struct lttng_event *ev, const char *channel_name)
+{
+ return lttng_enable_event_with_exclusions(handle, ev, channel_name,
+ NULL, 0, NULL);
+}
+
+/*
+ * Create or enable an event with a filter expression.
+ *
+ * Return negative error value on error.
+ * Return size of returned session payload data if OK.
+ */
+int lttng_enable_event_with_filter(struct lttng_handle *handle,
+ struct lttng_event *event, const char *channel_name,
+ const char *filter_expression)
+{
+ return lttng_enable_event_with_exclusions(handle, event, channel_name,
+ 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.
+ * If no channel name is specified, the default name is used.
+ * If filter expression is not NULL, the filter is set for the event.
+ * If exclusion count is not zero, the exclusions are set for the event.
+ * Returns size of returned session payload data or a negative error code.
+ */
+int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
+ struct lttng_event *ev, const char *channel_name,
+ const char *filter_expression,
+ int exclusion_count, char **exclusion_list)
{
struct lttcomm_session_msg lsm;
+ char *varlen_data, *jul_filter = NULL;
+ int ret = 0;
+ struct filter_parser_ctx *ctx = NULL;
+ FILE *fmem = NULL;
if (handle == NULL || ev == NULL) {
return -LTTNG_ERR_INVALID;
}
+ /* Empty filter string will always be rejected by the parser
+ * anyway, so treat this corner-case early to eliminate
+ * lttng_fmemopen error for 0-byte allocation.
+ */
+ if (filter_expression && filter_expression[0] == '\0') {
+ return -LTTNG_ERR_INVALID;
+ }
+
memset(&lsm, 0, sizeof(lsm));
- /* If no channel name, we put the default name */
+ /* If no channel name, send empty string. */
if (channel_name == NULL) {
- copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME,
+ lttng_ctl_copy_string(lsm.u.enable.channel_name, "",
sizeof(lsm.u.enable.channel_name));
} else {
- copy_string(lsm.u.enable.channel_name, channel_name,
+ lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name,
sizeof(lsm.u.enable.channel_name));
}
- copy_lttng_domain(&lsm.domain, &handle->domain);
-
if (ev->name[0] != '\0') {
lsm.cmd_type = LTTNG_ENABLE_EVENT;
} else {
lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
}
+
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
+ lsm.u.enable.exclusion_count = exclusion_count;
+ lsm.u.enable.bytecode_len = 0;
- return ask_sessiond(&lsm, NULL);
-}
-
-/*
- * set filter for an event
- * Return negative error value on error.
- * Return size of returned session payload data if OK.
- */
-
-int lttng_set_event_filter(struct lttng_handle *handle,
- const char *event_name, const char *channel_name,
- const char *filter_expression)
-{
- struct lttcomm_session_msg lsm;
- struct filter_parser_ctx *ctx;
- FILE *fmem;
- int ret = 0;
-
- /* Safety check. */
- if (handle == NULL) {
- return -LTTNG_ERR_INVALID;
- }
-
- if (!filter_expression) {
- return 0;
+ /*
+ * 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;
}
/*
- * casting const to non-const, as the underlying function will
- * use it in read-only mode.
+ * We have either a filter or some exclusions, so we need to set up
+ * a variable-length memory block from where to send the data
*/
- fmem = lttng_fmemopen((void *) filter_expression,
- strlen(filter_expression), "r");
- if (!fmem) {
- fprintf(stderr, "Error opening memory as stream\n");
- return -LTTNG_ERR_FILTER_NOMEM;
- }
- ctx = filter_parser_ctx_alloc(fmem);
- if (!ctx) {
- fprintf(stderr, "Error allocating parser\n");
- ret = -LTTNG_ERR_FILTER_NOMEM;
- goto alloc_error;
- }
- ret = filter_parser_ctx_append_ast(ctx);
- if (ret) {
- fprintf(stderr, "Parse error\n");
- ret = -LTTNG_ERR_FILTER_INVAL;
- goto parse_error;
- }
- ret = filter_visitor_set_parent(ctx);
- if (ret) {
- fprintf(stderr, "Set parent error\n");
- ret = -LTTNG_ERR_FILTER_INVAL;
- goto parse_error;
- }
- if (print_xml) {
- ret = filter_visitor_print_xml(ctx, stdout, 0);
+
+ /* Parse filter expression */
+ 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
+ * use it in read-only mode.
+ */
+ fmem = lttng_fmemopen((void *) filter_expression,
+ 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);
+ if (!ctx) {
+ fprintf(stderr, "Error allocating parser\n");
+ ret = -LTTNG_ERR_FILTER_NOMEM;
+ goto filter_alloc_error;
+ }
+ ret = filter_parser_ctx_append_ast(ctx);
if (ret) {
- fflush(stdout);
- fprintf(stderr, "XML print error\n");
+ fprintf(stderr, "Parse error\n");
ret = -LTTNG_ERR_FILTER_INVAL;
goto parse_error;
}
- }
-
- dbg_printf("Generating IR... ");
- fflush(stdout);
- ret = filter_visitor_ir_generate(ctx);
- if (ret) {
- fprintf(stderr, "Generate IR error\n");
- ret = -LTTNG_ERR_FILTER_INVAL;
- goto parse_error;
- }
- dbg_printf("done\n");
-
- dbg_printf("Validating IR... ");
- fflush(stdout);
- ret = filter_visitor_ir_check_binary_op_nesting(ctx);
- if (ret) {
- ret = -LTTNG_ERR_FILTER_INVAL;
- goto parse_error;
- }
- dbg_printf("done\n");
-
- dbg_printf("Generating bytecode... ");
- fflush(stdout);
- ret = filter_visitor_bytecode_generate(ctx);
- if (ret) {
- fprintf(stderr, "Generate bytecode error\n");
- ret = -LTTNG_ERR_FILTER_INVAL;
- goto parse_error;
- }
- dbg_printf("done\n");
- dbg_printf("Size of bytecode generated: %u bytes.\n",
- bytecode_get_len(&ctx->bytecode->b));
-
- memset(&lsm, 0, sizeof(lsm));
-
- lsm.cmd_type = LTTNG_SET_FILTER;
-
- /* Copy channel name */
- copy_string(lsm.u.filter.channel_name, channel_name,
- sizeof(lsm.u.filter.channel_name));
- /* Copy event name */
- copy_string(lsm.u.filter.event_name, event_name,
- sizeof(lsm.u.filter.event_name));
- lsm.u.filter.bytecode_len = sizeof(ctx->bytecode->b)
- + bytecode_get_len(&ctx->bytecode->b);
-
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ ret = filter_visitor_set_parent(ctx);
+ if (ret) {
+ fprintf(stderr, "Set parent error\n");
+ ret = -LTTNG_ERR_FILTER_INVAL;
+ goto parse_error;
+ }
+ if (print_xml) {
+ ret = filter_visitor_print_xml(ctx, stdout, 0);
+ if (ret) {
+ fflush(stdout);
+ fprintf(stderr, "XML print error\n");
+ ret = -LTTNG_ERR_FILTER_INVAL;
+ goto parse_error;
+ }
+ }
- copy_string(lsm.session.name, handle->session_name,
- sizeof(lsm.session.name));
+ dbg_printf("Generating IR... ");
+ fflush(stdout);
+ ret = filter_visitor_ir_generate(ctx);
+ if (ret) {
+ fprintf(stderr, "Generate IR error\n");
+ ret = -LTTNG_ERR_FILTER_INVAL;
+ goto parse_error;
+ }
+ dbg_printf("done\n");
- ret = ask_sessiond_varlen(&lsm, &ctx->bytecode->b,
- lsm.u.filter.bytecode_len, NULL);
+ dbg_printf("Validating IR... ");
+ fflush(stdout);
+ ret = filter_visitor_ir_check_binary_op_nesting(ctx);
+ if (ret) {
+ ret = -LTTNG_ERR_FILTER_INVAL;
+ goto parse_error;
+ }
+ dbg_printf("done\n");
- filter_bytecode_free(ctx);
- filter_ir_free(ctx);
- filter_parser_ctx_free(ctx);
- if (fclose(fmem) != 0) {
- perror("fclose");
+ dbg_printf("Generating bytecode... ");
+ fflush(stdout);
+ ret = filter_visitor_bytecode_generate(ctx);
+ if (ret) {
+ fprintf(stderr, "Generate bytecode error\n");
+ ret = -LTTNG_ERR_FILTER_INVAL;
+ goto parse_error;
+ }
+ dbg_printf("done\n");
+ dbg_printf("Size of bytecode generated: %u bytes.\n",
+ bytecode_get_len(&ctx->bytecode->b));
+
+ lsm.u.enable.bytecode_len = sizeof(ctx->bytecode->b)
+ + bytecode_get_len(&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 + lsm.u.enable.expression_len,
+ NULL);
+ free(varlen_data);
+
+varlen_alloc_error:
+ if (filter_expression) {
+ filter_bytecode_free(ctx);
+ filter_ir_free(ctx);
+ filter_parser_ctx_free(ctx);
+ if (fclose(fmem) != 0) {
+ perror("fclose");
+ }
}
+ free(jul_filter);
return ret;
parse_error:
filter_bytecode_free(ctx);
filter_ir_free(ctx);
filter_parser_ctx_free(ctx);
-alloc_error:
+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;
}
memset(&lsm, 0, sizeof(lsm));
- if (channel_name) {
- copy_string(lsm.u.disable.channel_name, channel_name,
+ /* If no channel name, send empty string. */
+ if (channel_name == NULL) {
+ lttng_ctl_copy_string(lsm.u.disable.channel_name, "",
sizeof(lsm.u.disable.channel_name));
} else {
- copy_string(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME,
+ lttng_ctl_copy_string(lsm.u.disable.channel_name, channel_name,
sizeof(lsm.u.disable.channel_name));
}
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
if (name != NULL) {
- copy_string(lsm.u.disable.name, name, sizeof(lsm.u.disable.name));
+ lttng_ctl_copy_string(lsm.u.disable.name, name,
+ sizeof(lsm.u.disable.name));
lsm.cmd_type = LTTNG_DISABLE_EVENT;
} else {
lsm.cmd_type = LTTNG_DISABLE_ALL_EVENT;
}
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
lsm.cmd_type = LTTNG_DISABLE_CHANNEL;
- copy_string(lsm.u.disable.channel_name, name,
+ lttng_ctl_copy_string(lsm.u.disable.channel_name, name,
sizeof(lsm.u.disable.channel_name));
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_LIST_TRACEPOINTS;
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- ret = ask_sessiond(&lsm, (void **) events);
+ ret = lttng_ctl_ask_sessiond(&lsm, (void **) events);
if (ret < 0) {
return ret;
}
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_LIST_TRACEPOINT_FIELDS;
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- ret = ask_sessiond(&lsm, (void **) fields);
+ ret = lttng_ctl_ask_sessiond(&lsm, (void **) fields);
if (ret < 0) {
return ret;
}
*/
int lttng_create_session(const char *name, const char *url)
{
+ int ret;
ssize_t size;
struct lttcomm_session_msg lsm;
struct lttng_uri *uris = NULL;
memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_CREATE_SESSION;
- copy_string(lsm.session.name, name, sizeof(lsm.session.name));
+ lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
/* There should never be a data URL */
- size = parse_str_urls_to_uri(url, NULL, &uris);
+ size = uri_parse_str_urls(url, NULL, &uris);
if (size < 0) {
return -LTTNG_ERR_INVALID;
}
lsm.u.uri.size = size;
- return ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size,
- NULL);
+ ret = lttng_ctl_ask_sessiond_varlen(&lsm, uris,
+ sizeof(struct lttng_uri) * size, NULL);
+
+ free(uris);
+ return ret;
}
/*
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_DESTROY_SESSION;
- copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
+ lttng_ctl_copy_string(lsm.session.name, session_name,
+ sizeof(lsm.session.name));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
int ret;
struct lttcomm_session_msg lsm;
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_LIST_SESSIONS;
- ret = ask_sessiond(&lsm, (void**) sessions);
+ ret = lttng_ctl_ask_sessiond(&lsm, (void**) sessions);
if (ret < 0) {
return ret;
}
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_LIST_DOMAINS;
- copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
+ lttng_ctl_copy_string(lsm.session.name, session_name,
+ sizeof(lsm.session.name));
- ret = ask_sessiond(&lsm, (void**) domains);
+ ret = lttng_ctl_ask_sessiond(&lsm, (void**) domains);
if (ret < 0) {
return ret;
}
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_LIST_CHANNELS;
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- ret = ask_sessiond(&lsm, (void**) channels);
+ ret = lttng_ctl_ask_sessiond(&lsm, (void**) channels);
if (ret < 0) {
return ret;
}
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_LIST_EVENTS;
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- copy_string(lsm.u.list.channel_name, channel_name,
+ lttng_ctl_copy_string(lsm.u.list.channel_name, channel_name,
sizeof(lsm.u.list.channel_name));
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- ret = ask_sessiond(&lsm, (void**) events);
+ ret = lttng_ctl_ask_sessiond(&lsm, (void**) events);
if (ret < 0) {
return ret;
}
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_CALIBRATE;
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
memcpy(&lsm.u.calibrate, calibrate, sizeof(lsm.u.calibrate));
- return ask_sessiond(&lsm, NULL);
+ return lttng_ctl_ask_sessiond(&lsm, NULL);
}
/*
memset(attr, 0, sizeof(struct lttng_channel_attr));
+ /* Same for all domains. */
+ attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
+ attr->tracefile_size = DEFAULT_CHANNEL_TRACEFILE_SIZE;
+ attr->tracefile_count = DEFAULT_CHANNEL_TRACEFILE_COUNT;
+
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
- attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
- attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
- attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
-
+ attr->switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
+ attr->read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
attr->subbuf_size = default_get_kernel_channel_subbuf_size();
attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
break;
case LTTNG_DOMAIN_UST:
-#if 0
- case LTTNG_DOMAIN_UST_EXEC_NAME:
- case LTTNG_DOMAIN_UST_PID:
- case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
- attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
- attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
- attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
-
- attr->subbuf_size = default_get_ust_channel_subbuf_size();
- attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
- attr->output = DEFAULT_UST_CHANNEL_OUTPUT;
- break;
+ switch (domain->buf_type) {
+ case LTTNG_BUFFER_PER_UID:
+ attr->subbuf_size = default_get_ust_uid_channel_subbuf_size();
+ attr->num_subbuf = DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM;
+ attr->output = DEFAULT_UST_UID_CHANNEL_OUTPUT;
+ attr->switch_timer_interval = DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER;
+ attr->read_timer_interval = DEFAULT_UST_UID_CHANNEL_READ_TIMER;
+ break;
+ case LTTNG_BUFFER_PER_PID:
+ default:
+ attr->subbuf_size = default_get_ust_pid_channel_subbuf_size();
+ attr->num_subbuf = DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM;
+ attr->output = DEFAULT_UST_PID_CHANNEL_OUTPUT;
+ attr->switch_timer_interval = DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER;
+ attr->read_timer_interval = DEFAULT_UST_PID_CHANNEL_READ_TIMER;
+ break;
+ }
default:
/* Default behavior: leave set to 0. */
break;
return ret;
}
- if (strlen(sessiond_sock_path) == 0) {
+ if (*sessiond_sock_path == '\0') {
/*
* No socket path set. Weird error which means the constructor was not
* called.
int lttng_set_consumer_url(struct lttng_handle *handle,
const char *control_url, const char *data_url)
{
+ int ret;
ssize_t size;
struct lttcomm_session_msg lsm;
struct lttng_uri *uris = NULL;
lsm.cmd_type = LTTNG_SET_CONSUMER_URI;
- copy_string(lsm.session.name, handle->session_name,
+ lttng_ctl_copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
- copy_lttng_domain(&lsm.domain, &handle->domain);
+ lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
- size = parse_str_urls_to_uri(control_url, data_url, &uris);
+ size = uri_parse_str_urls(control_url, data_url, &uris);
if (size < 0) {
return -LTTNG_ERR_INVALID;
}
lsm.u.uri.size = size;
- return ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size,
- NULL);
+ ret = lttng_ctl_ask_sessiond_varlen(&lsm, uris,
+ sizeof(struct lttng_uri) * size, NULL);
+
+ free(uris);
+ return ret;
}
/*
- * Enable consumer for a session and domain.
- *
- * Return 0 on success, else a negative value.
+ * [OBSOLETE]
*/
int lttng_enable_consumer(struct lttng_handle *handle)
{
- struct lttcomm_session_msg lsm;
-
- if (handle == NULL) {
- return -LTTNG_ERR_INVALID;
- }
-
- lsm.cmd_type = LTTNG_ENABLE_CONSUMER;
-
- copy_string(lsm.session.name, handle->session_name,
- sizeof(lsm.session.name));
- copy_lttng_domain(&lsm.domain, &handle->domain);
-
- return ask_sessiond(&lsm, NULL);
+ return -ENOSYS;
}
/*
- * Disable consumer for a session and domain.
- *
- * Return 0 on success, else a negative value.
+ * [OBSOLETE]
*/
int lttng_disable_consumer(struct lttng_handle *handle)
{
- struct lttcomm_session_msg lsm;
-
- if (handle == NULL) {
- return -LTTNG_ERR_INVALID;
- }
-
- lsm.cmd_type = LTTNG_DISABLE_CONSUMER;
-
- copy_string(lsm.session.name, handle->session_name,
- sizeof(lsm.session.name));
- copy_lttng_domain(&lsm.domain, &handle->domain);
-
- return ask_sessiond(&lsm, NULL);
-}
-
-/*
- * Set health socket path by putting it in the global health_sock_path
- * variable.
- *
- * Returns 0 on success or assert(0) on ENOMEM.
- */
-static int set_health_socket_path(void)
-{
- int ret;
- int in_tgroup = 0; /* In tracing group */
- uid_t uid;
- const char *home;
-
- uid = getuid();
-
- if (uid != 0) {
- /* Are we in the tracing group ? */
- in_tgroup = check_tracing_group(tracing_group);
- }
-
- if ((uid == 0) || in_tgroup) {
- copy_string(health_sock_path, DEFAULT_GLOBAL_HEALTH_UNIX_SOCK,
- sizeof(health_sock_path));
- }
-
- if (uid != 0) {
- /*
- * With GNU C < 2.1, snprintf returns -1 if the target buffer is too small;
- * With GNU C >= 2.1, snprintf returns the required size (excluding closing null)
- */
- home = getenv("HOME");
- if (home == NULL) {
- /* Fallback in /tmp .. */
- home = "/tmp";
- }
-
- ret = snprintf(health_sock_path, sizeof(health_sock_path),
- DEFAULT_HOME_HEALTH_UNIX_SOCK, home);
- if ((ret < 0) || (ret >= sizeof(health_sock_path))) {
- /* ENOMEM at this point... just kill the control lib. */
- assert(0);
- }
- }
-
- return 0;
-}
-
-/*
- * Check session daemon health for a specific health component.
- *
- * Return 0 if health is OK or else 1 if BAD.
- *
- * Any other negative value is a lttng error code which can be translated with
- * lttng_strerror().
- */
-int lttng_health_check(enum lttng_health_component c)
-{
- int sock, ret;
- struct lttcomm_health_msg msg;
- struct lttcomm_health_data reply;
-
- /* Connect to the sesssion daemon */
- sock = lttcomm_connect_unix_sock(health_sock_path);
- if (sock < 0) {
- ret = -LTTNG_ERR_NO_SESSIOND;
- goto error;
- }
-
- msg.cmd = LTTNG_HEALTH_CHECK;
- msg.component = c;
-
- ret = lttcomm_send_unix_sock(sock, (void *)&msg, sizeof(msg));
- if (ret < 0) {
- ret = -LTTNG_ERR_FATAL;
- goto close_error;
- }
-
- ret = lttcomm_recv_unix_sock(sock, (void *)&reply, sizeof(reply));
- if (ret < 0) {
- ret = -LTTNG_ERR_FATAL;
- goto close_error;
- }
-
- ret = reply.ret_code;
-
-close_error:
- close(sock);
-
-error:
- return ret;
+ return -ENOSYS;
}
/*
memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_CREATE_SESSION;
- copy_string(lsm.session.name, name, sizeof(lsm.session.name));
+ lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
/* There should never be a data URL */
- size = parse_str_urls_to_uri(url, NULL, &uris);
+ size = uri_parse_str_urls(url, NULL, &uris);
if (size < 0) {
- return -LTTNG_ERR_INVALID;
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
}
lsm.u.uri.size = size;
if (size > 0 && uris[0].dtype != LTTNG_DST_PATH && strlen(uris[0].subdir) == 0) {
- ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s", name,
- datetime);
+ /* Don't append datetime if the name was automatically created. */
+ if (strncmp(name, DEFAULT_SESSION_NAME "-",
+ strlen(DEFAULT_SESSION_NAME) + 1)) {
+ ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s",
+ name, datetime);
+ } else {
+ ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s", name);
+ }
if (ret < 0) {
PERROR("snprintf uri subdir");
- return -LTTNG_ERR_FATAL;
+ ret = -LTTNG_ERR_FATAL;
+ goto error;
}
}
- return ask_sessiond_varlen(&lsm, uris, sizeof(struct lttng_uri) * size,
- NULL);
+ ret = lttng_ctl_ask_sessiond_varlen(&lsm, uris,
+ sizeof(struct lttng_uri) * size, NULL);
+
+error:
+ free(uris);
+ return ret;
}
/*
return -LTTNG_ERR_INVALID;
}
+ memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_DATA_PENDING;
- copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
+ lttng_ctl_copy_string(lsm.session.name, session_name,
+ sizeof(lsm.session.name));
- ret = ask_sessiond(&lsm, NULL);
+ ret = lttng_ctl_ask_sessiond(&lsm, NULL);
/*
- * The ask_sessiond function negate the return code if it's not LTTNG_OK so
- * getting -1 means that the reply ret_code was 1 thus meaning that the
- * data is available. Yes it is hackish but for now this is the only way.
+ * The lttng_ctl_ask_sessiond function negate the return code if it's not
+ * LTTNG_OK so getting -1 means that the reply ret_code was 1 thus meaning
+ * that the data is available. Yes it is hackish but for now this is the
+ * only way.
*/
if (ret == -1) {
ret = 1;
return ret;
}
+/*
+ * Create a session exclusively used for snapshot.
+ *
+ * Returns LTTNG_OK on success or a negative error code.
+ */
+int lttng_create_session_snapshot(const char *name, const char *snapshot_url)
+{
+ int ret;
+ ssize_t size;
+ struct lttcomm_session_msg lsm;
+ struct lttng_uri *uris = NULL;
+
+ if (name == NULL) {
+ return -LTTNG_ERR_INVALID;
+ }
+
+ memset(&lsm, 0, sizeof(lsm));
+
+ lsm.cmd_type = LTTNG_CREATE_SESSION_SNAPSHOT;
+ lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
+
+ size = uri_parse_str_urls(snapshot_url, NULL, &uris);
+ if (size < 0) {
+ return -LTTNG_ERR_INVALID;
+ }
+
+ lsm.u.uri.size = size;
+
+ ret = lttng_ctl_ask_sessiond_varlen(&lsm, uris,
+ sizeof(struct lttng_uri) * size, NULL);
+
+ free(uris);
+ return ret;
+}
+
+/*
+ * Create a session exclusively used for live.
+ *
+ * Returns LTTNG_OK on success or a negative error code.
+ */
+int lttng_create_session_live(const char *name, const char *url,
+ unsigned int timer_interval)
+{
+ int ret;
+ ssize_t size;
+ struct lttcomm_session_msg lsm;
+ struct lttng_uri *uris = NULL;
+
+ if (name == NULL) {
+ return -LTTNG_ERR_INVALID;
+ }
+
+ memset(&lsm, 0, sizeof(lsm));
+
+ lsm.cmd_type = LTTNG_CREATE_SESSION_LIVE;
+ lttng_ctl_copy_string(lsm.session.name, name, sizeof(lsm.session.name));
+
+ 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;
+ }
+ } else {
+ size = 0;
+ }
+
+ lsm.u.session_live.nb_uri = size;
+ lsm.u.session_live.timer_interval = timer_interval;
+
+ ret = lttng_ctl_ask_sessiond_varlen(&lsm, uris,
+ sizeof(struct lttng_uri) * size, NULL);
+
+end:
+ free(uris);
+ return ret;
+}
+
/*
* lib constructor
*/
{
/* Set default session group */
lttng_set_tracing_group(DEFAULT_TRACING_GROUP);
- /* Set socket for health check */
- (void) set_health_socket_path();
}
/*
projects / lttng-tools.git / blobdiff