X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=665aba57d7cb80f37656c670fe6d3760747eb7a0;hp=222d719f8e09b40d37b9a5e9ee7c36d9bb1e1d97;hb=0c82ac624169ec9ec062f395e55abfe992d0fd91;hpb=67676bd8b522e83c6d45c7f6a205ab7a30001c9d

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 222d719f8..665aba57d 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <grp.h>
 #include <errno.h>
@@ -74,6 +74,7 @@ static int connected;
  */
 int lttng_opt_quiet;
 int lttng_opt_verbose;
+int lttng_opt_mi;
 
 /*
  * Copy string from src to dst and enforce null terminated byte.
@@ -104,6 +105,8 @@ void lttng_ctl_copy_lttng_domain(struct lttng_domain *dst,
 		case LTTNG_DOMAIN_KERNEL:
 		case LTTNG_DOMAIN_UST:
 		case LTTNG_DOMAIN_JUL:
+		case LTTNG_DOMAIN_LOG4J:
+		case LTTNG_DOMAIN_PYTHON:
 			memcpy(dst, src, sizeof(struct lttng_domain));
 			break;
 		default:
@@ -217,19 +220,19 @@ int lttng_check_tracing_group(void)
 	/* Get number of supplementary group IDs */
 	grp_list_size = getgroups(0, NULL);
 	if (grp_list_size < 0) {
-		perror("getgroups");
+		PERROR("getgroups");
 		goto end;
 	}
 
 	/* Alloc group list of the right size */
-	grp_list = malloc(grp_list_size * sizeof(gid_t));
+	grp_list = zmalloc(grp_list_size * sizeof(gid_t));
 	if (!grp_list) {
-		perror("malloc");
+		PERROR("malloc");
 		goto end;
 	}
 	grp_id = getgroups(grp_list_size, grp_list);
 	if (grp_id < 0) {
-		perror("getgroups");
+		PERROR("getgroups");
 		goto free_list;
 	}
 
@@ -271,7 +274,7 @@ static int try_connect_sessiond(const char *sock_path)
 
 	ret = lttcomm_close_unix_sock(ret);
 	if (ret < 0) {
-		perror("lttcomm_close_unix_sock");
+		PERROR("lttcomm_close_unix_sock");
 	}
 
 	return 0;
@@ -442,7 +445,11 @@ int lttng_ctl_ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
 		goto end;
 	}
 
-	data = (void*) malloc(size);
+	data = zmalloc(size);
+	if (!data) {
+		ret = -ENOMEM;
+		goto end;
+	}
 
 	/* Get payload data */
 	ret = recv_data_sessiond(data, size);
@@ -482,7 +489,7 @@ struct lttng_handle *lttng_create_handle(const char *session_name,
 		goto end;
 	}
 
-	handle = malloc(sizeof(struct lttng_handle));
+	handle = zmalloc(sizeof(struct lttng_handle));
 	if (handle == NULL) {
 		PERROR("malloc handle");
 		goto end;
@@ -520,6 +527,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 +550,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 +571,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 +586,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 +601,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;
@@ -691,6 +694,186 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle,
 			filter_expression, 0, NULL);
 }
 
+/*
+ * Depending on the event, return a newly allocated agent filter expression or
+ * NULL if not applicable.
+ *
+ * An event with NO loglevel and the name is * will return NULL.
+ */
+static char *set_agent_filter(const char *filter, struct lttng_event *ev)
+{
+	int err;
+	char *agent_filter = NULL;
+
+	assert(ev);
+
+	/* Don't add filter for the '*' event. */
+	if (ev->name[0] != '*') {
+		if (filter) {
+			err = asprintf(&agent_filter, "(%s) && (logger_name == \"%s\")", filter,
+					ev->name);
+		} else {
+			err = asprintf(&agent_filter, "logger_name == \"%s\"", ev->name);
+		}
+		if (err < 0) {
+			PERROR("asprintf");
+			goto error;
+		}
+	}
+
+	/* 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 || agent_filter) {
+			char *new_filter;
+
+			err = asprintf(&new_filter, "(%s) && (int_loglevel %s %d)",
+					agent_filter ? agent_filter : filter, op,
+					ev->loglevel);
+			if (agent_filter) {
+				free(agent_filter);
+			}
+			agent_filter = new_filter;
+		} else {
+			err = asprintf(&agent_filter, "int_loglevel %s %d", op,
+					ev->loglevel);
+		}
+		if (err < 0) {
+			PERROR("asprintf");
+			goto error;
+		}
+	}
+
+	return agent_filter;
+error:
+	free(agent_filter);
+	return NULL;
+}
+
+/*
+ * Generate the filter bytecode from a given filter expression string. Put the
+ * newly allocated parser context in ctxp and populate the lsm object with the
+ * expression len.
+ *
+ * Return 0 on success else a LTTNG_ERR_* code and ctxp is untouched.
+ */
+static int generate_filter(char *filter_expression,
+		struct lttcomm_session_msg *lsm, struct filter_parser_ctx **ctxp)
+{
+	int ret;
+	struct filter_parser_ctx *ctx = NULL;
+	FILE *fmem = NULL;
+
+	assert(filter_expression);
+	assert(lsm);
+	assert(ctxp);
+
+	/*
+	 * 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");
+		ret = -LTTNG_ERR_FILTER_NOMEM;
+		goto error;
+	}
+	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) {
+		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);
+		if (ret) {
+			fflush(stdout);
+			fprintf(stderr, "XML print 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;
+	}
+	/* Validate strings used as literals in the expression */
+	ret = filter_visitor_ir_validate_string(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));
+
+	lsm->u.enable.bytecode_len = sizeof(ctx->bytecode->b)
+		+ bytecode_get_len(&ctx->bytecode->b);
+	lsm->u.enable.expression_len = strlen(filter_expression) + 1;
+
+	/* No need to keep the memory stream. */
+	if (fclose(fmem) != 0) {
+		PERROR("fclose");
+	}
+
+	*ctxp = ctx;
+	return 0;
+
+parse_error:
+	filter_ir_free(ctx);
+	filter_parser_ctx_free(ctx);
+filter_alloc_error:
+	if (fclose(fmem) != 0) {
+		PERROR("fclose");
+	}
+error:
+	return ret;
+}
+
 /*
  * Enable event(s) for a channel, possibly with exclusions and a filter.
  * If no event name is specified, all events are enabled.
@@ -701,17 +884,24 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle,
  */
 int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 		struct lttng_event *ev, const char *channel_name,
-		const char *filter_expression,
+		const char *original_filter_expression,
 		int exclusion_count, char **exclusion_list)
 {
 	struct lttcomm_session_msg lsm;
 	char *varlen_data;
 	int ret = 0;
+	unsigned int free_filter_expression = 0;
 	struct filter_parser_ctx *ctx = NULL;
-	FILE *fmem = NULL;
+	/*
+	 * Cast as non-const since we may replace the filter expression
+	 * by a dynamically allocated string. Otherwise, the original
+	 * string is not modified.
+	 */
+	char *filter_expression = (char *) original_filter_expression;
 
 	if (handle == NULL || ev == NULL) {
-		return -LTTNG_ERR_INVALID;
+		ret = -LTTNG_ERR_INVALID;
+		goto error;
 	}
 
 	/* Empty filter string will always be rejected by the parser
@@ -719,7 +909,8 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	 * lttng_fmemopen error for 0-byte allocation.
 	 */
 	if (filter_expression && filter_expression[0] == '\0') {
-		return -LTTNG_ERR_INVALID;
+		ret = -LTTNG_ERR_INVALID;
+		goto error;
 	}
 
 	memset(&lsm, 0, sizeof(lsm));
@@ -733,9 +924,14 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 				sizeof(lsm.u.enable.channel_name));
 	}
 
-	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 	lsm.cmd_type = LTTNG_ENABLE_EVENT;
+	if (ev->name[0] == '\0') {
+		/* Enable all events */
+		lttng_ctl_copy_string(ev->name, "*", sizeof(ev->name));
+	}
 
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+	/* FIXME: copying non-packed struct to packed struct. */
 	memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 
 	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
@@ -743,9 +939,16 @@ 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 &&
+				handle->domain.type != LTTNG_DOMAIN_LOG4J &&
+				handle->domain.type != LTTNG_DOMAIN_PYTHON)) {
+		goto ask_sessiond;
 	}
 
 	/*
@@ -754,149 +957,126 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 	 */
 
 	/* Parse filter expression */
-	if (filter_expression != NULL) {
-
-		/*
-		 * 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");
-			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) {
-			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);
-			if (ret) {
-				fflush(stdout);
-				fprintf(stderr, "XML print error\n");
-				ret = -LTTNG_ERR_FILTER_INVAL;
-				goto parse_error;
+	if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
+			|| handle->domain.type == LTTNG_DOMAIN_LOG4J
+			|| handle->domain.type == LTTNG_DOMAIN_PYTHON) {
+		if (handle->domain.type == LTTNG_DOMAIN_JUL ||
+				handle->domain.type == LTTNG_DOMAIN_LOG4J ||
+				handle->domain.type == LTTNG_DOMAIN_PYTHON) {
+			char *agent_filter;
+
+			/* Setup JUL filter if needed. */
+			agent_filter = set_agent_filter(filter_expression, ev);
+			if (!agent_filter) {
+				if (!filter_expression) {
+					/* No JUL and no filter, just skip everything below. */
+					goto ask_sessiond;
+				}
+			} else {
+				/*
+				 * With an agent filter, the original filter has been added to
+				 * it thus replace the filter expression.
+				 */
+				filter_expression = agent_filter;
+				free_filter_expression = 1;
 			}
 		}
 
-		dbg_printf("Generating IR... ");
-		fflush(stdout);
-		ret = filter_visitor_ir_generate(ctx);
+		ret = generate_filter(filter_expression, &lsm, &ctx);
 		if (ret) {
-			fprintf(stderr, "Generate IR error\n");
-			ret = -LTTNG_ERR_FILTER_INVAL;
-			goto parse_error;
+			goto filter_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));
+	}
 
-		lsm.u.enable.bytecode_len = sizeof(ctx->bytecode->b)
-				+ bytecode_get_len(&ctx->bytecode->b);
+	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 mem_error;
 	}
 
-	/* 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);
+	/* 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 - 1);
+	}
+	/* 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 (ctx && 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);
+			lsm.u.enable.bytecode_len + lsm.u.enable.expression_len, NULL);
+	free(varlen_data);
 
-	if (lsm.u.enable.exclusion_count != 0) {
-		free(varlen_data);
-	}
-
-varlen_alloc_error:
-	if (filter_expression) {
+mem_error:
+	if (filter_expression && ctx) {
 		filter_bytecode_free(ctx);
 		filter_ir_free(ctx);
 		filter_parser_ctx_free(ctx);
-		if (fclose(fmem) != 0) {
-			perror("fclose");
-		}
 	}
+filter_error:
+	if (free_filter_expression) {
+		/*
+		 * The filter expression has been replaced and must be freed as it is
+		 * not the original filter expression received as a parameter.
+		 */
+		free(filter_expression);
+	}
+error:
+	/*
+	 * Return directly to the caller and don't ask the sessiond since something
+	 * went wrong in the parsing of data above.
+	 */
 	return ret;
 
-parse_error:
-	filter_bytecode_free(ctx);
-	filter_ir_free(ctx);
-	filter_parser_ctx_free(ctx);
-filter_alloc_error:
-	if (fclose(fmem) != 0) {
-		perror("fclose");
-	}
+ask_sessiond:
+	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
 	return ret;
 }
 
-/*
- *  Disable event(s) of a channel and domain.
- *  If no event name is specified, all events are disabled.
- *  If no channel name is specified, the default 'channel0' is used.
- *  Returns size of returned session payload data or a negative error code.
- */
-int lttng_disable_event(struct lttng_handle *handle, const char *name,
-		const char *channel_name)
+int lttng_disable_event_ext(struct lttng_handle *handle,
+		struct lttng_event *ev, const char *channel_name,
+		const char *original_filter_expression)
 {
 	struct lttcomm_session_msg lsm;
+	char *varlen_data;
+	int ret = 0;
+	unsigned int free_filter_expression = 0;
+	struct filter_parser_ctx *ctx = NULL;
+	/*
+	 * Cast as non-const since we may replace the filter expression
+	 * by a dynamically allocated string. Otherwise, the original
+	 * string is not modified.
+	 */
+	char *filter_expression = (char *) original_filter_expression;
 
-	if (handle == NULL) {
-		return -LTTNG_ERR_INVALID;
+	if (handle == NULL || ev == NULL) {
+		ret = -LTTNG_ERR_INVALID;
+		goto error;
+	}
+
+	/* 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') {
+		ret = -LTTNG_ERR_INVALID;
+		goto error;
 	}
 
 	memset(&lsm, 0, sizeof(lsm));
@@ -910,20 +1090,132 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 				sizeof(lsm.u.disable.channel_name));
 	}
 
-	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+	lsm.cmd_type = LTTNG_DISABLE_EVENT;
 
-	if (name != NULL) {
-		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;
-	}
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+	/* FIXME: copying non-packed struct to packed struct. */
+	memcpy(&lsm.u.disable.event, ev, sizeof(lsm.u.disable.event));
 
 	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
+	lsm.u.disable.bytecode_len = 0;
 
-	return lttng_ctl_ask_sessiond(&lsm, NULL);
+	/*
+	 * For the JUL domain, a filter is enforced except for the
+	 * disable all event. This is done to avoid having the event in
+	 * all sessions thus filtering by logger name.
+	 */
+	if (filter_expression == NULL &&
+			(handle->domain.type != LTTNG_DOMAIN_JUL &&
+				handle->domain.type != LTTNG_DOMAIN_LOG4J &&
+				handle->domain.type != LTTNG_DOMAIN_PYTHON)) {
+		goto ask_sessiond;
+	}
+
+	/*
+	 * We have a filter, so we need to set up a variable-length
+	 * memory block from where to send the data.
+	 */
+
+	/* Parse filter expression */
+	if (filter_expression != NULL || handle->domain.type == LTTNG_DOMAIN_JUL
+			|| handle->domain.type == LTTNG_DOMAIN_LOG4J
+			|| handle->domain.type == LTTNG_DOMAIN_PYTHON) {
+		if (handle->domain.type == LTTNG_DOMAIN_JUL ||
+				handle->domain.type == LTTNG_DOMAIN_LOG4J ||
+				handle->domain.type == LTTNG_DOMAIN_PYTHON) {
+			char *agent_filter;
+
+			/* Setup JUL filter if needed. */
+			agent_filter = set_agent_filter(filter_expression, ev);
+			if (!agent_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 = agent_filter;
+				free_filter_expression = 1;
+			}
+		}
+
+		ret = generate_filter(filter_expression, &lsm, &ctx);
+		if (ret) {
+			goto filter_error;
+		}
+	}
+
+	varlen_data = zmalloc(lsm.u.disable.bytecode_len
+			+ lsm.u.disable.expression_len);
+	if (!varlen_data) {
+		ret = -LTTNG_ERR_EXCLUSION_NOMEM;
+		goto mem_error;
+	}
+
+	/* Add filter expression */
+	if (lsm.u.disable.expression_len != 0) {
+		memcpy(varlen_data,
+			filter_expression,
+			lsm.u.disable.expression_len);
+	}
+	/* Add filter bytecode next */
+	if (ctx && lsm.u.disable.bytecode_len != 0) {
+		memcpy(varlen_data
+			+ lsm.u.disable.expression_len,
+			&ctx->bytecode->b,
+			lsm.u.disable.bytecode_len);
+	}
+
+	ret = lttng_ctl_ask_sessiond_varlen(&lsm, varlen_data,
+			lsm.u.disable.bytecode_len + lsm.u.disable.expression_len, NULL);
+	free(varlen_data);
+
+mem_error:
+	if (filter_expression && ctx) {
+		filter_bytecode_free(ctx);
+		filter_ir_free(ctx);
+		filter_parser_ctx_free(ctx);
+	}
+filter_error:
+	if (free_filter_expression) {
+		/*
+		 * The filter expression has been replaced and must be freed as it is
+		 * not the original filter expression received as a parameter.
+		 */
+		free(filter_expression);
+	}
+error:
+	/*
+	 * Return directly to the caller and don't ask the sessiond since something
+	 * went wrong in the parsing of data above.
+	 */
+	return ret;
+
+ask_sessiond:
+	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
+	return ret;
+}
+
+/*
+ *  Disable event(s) of a channel and domain.
+ *  If no event name is specified, all events are disabled.
+ *  If no channel name is specified, the default 'channel0' is used.
+ *  Returns size of returned session payload data or a negative error code.
+ */
+int lttng_disable_event(struct lttng_handle *handle, const char *name,
+		const char *channel_name)
+{
+	struct lttng_event ev;
+
+	memset(&ev, 0, sizeof(ev));
+	ev.loglevel = -1;
+	ev.type = LTTNG_EVENT_ALL;
+	lttng_ctl_copy_string(ev.name, name, sizeof(ev.name));
+	return lttng_disable_event_ext(handle, &ev, channel_name, NULL);
 }
 
 /*
@@ -984,6 +1276,62 @@ int lttng_disable_channel(struct lttng_handle *handle, const char *name)
 	return lttng_ctl_ask_sessiond(&lsm, NULL);
 }
 
+/*
+ *  Add PID to session tracker.
+ *  Return 0 on success else a negative LTTng error code.
+ */
+int lttng_track_pid(struct lttng_handle *handle, int pid)
+{
+	struct lttcomm_session_msg lsm;
+
+	/*
+	 * NULL arguments are forbidden. No default values.
+	 */
+	if (handle == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+
+	lsm.cmd_type = LTTNG_TRACK_PID;
+	lsm.u.pid_tracker.pid = pid;
+
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+
+	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+			sizeof(lsm.session.name));
+
+	return lttng_ctl_ask_sessiond(&lsm, NULL);
+}
+
+/*
+ *  Remove PID from session tracker.
+ *  Return 0 on success else a negative LTTng error code.
+ */
+int lttng_untrack_pid(struct lttng_handle *handle, int pid)
+{
+	struct lttcomm_session_msg lsm;
+
+	/*
+	 * NULL arguments are forbidden. No default values.
+	 */
+	if (handle == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+
+	lsm.cmd_type = LTTNG_UNTRACK_PID;
+	lsm.u.pid_tracker.pid = pid;
+
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+
+	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+			sizeof(lsm.session.name));
+
+	return lttng_ctl_ask_sessiond(&lsm, NULL);
+}
+
 /*
  *  Lists all available tracepoints of domain.
  *  Sets the contents of the events array.
@@ -1000,6 +1348,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);
 
@@ -1027,6 +1376,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);
 
@@ -1038,6 +1388,35 @@ int lttng_list_tracepoint_fields(struct lttng_handle *handle,
 	return ret / sizeof(struct lttng_event_field);
 }
 
+/*
+ *  Lists all available kernel system calls. Allocates and sets the contents of
+ *  the events array.
+ *
+ *  Returns the number of lttng_event entries in events; on error, returns a
+ *  negative value.
+ */
+int lttng_list_syscalls(struct lttng_event **events)
+{
+	int ret;
+	struct lttcomm_session_msg lsm;
+
+	if (!events) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+	lsm.cmd_type = LTTNG_LIST_SYSCALLS;
+	/* Force kernel domain for system calls. */
+	lsm.domain.type = LTTNG_DOMAIN_KERNEL;
+
+	ret = lttng_ctl_ask_sessiond(&lsm, (void **) events);
+	if (ret < 0) {
+		return ret;
+	}
+
+	return ret / sizeof(struct lttng_event);
+}
+
 /*
  *  Returns a human readable string describing
  *  the error code (a negative value).
@@ -1095,6 +1474,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,
@@ -1114,6 +1494,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) {
@@ -1123,6 +1504,26 @@ int lttng_list_sessions(struct lttng_session **sessions)
 	return ret / sizeof(struct lttng_session);
 }
 
+int lttng_set_session_shm_path(const char *session_name,
+		const char *shm_path)
+{
+	struct lttcomm_session_msg lsm;
+
+	if (session_name == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+	lsm.cmd_type = LTTNG_SET_SESSION_SHM_PATH;
+
+	lttng_ctl_copy_string(lsm.session.name, session_name,
+			sizeof(lsm.session.name));
+	lttng_ctl_copy_string(lsm.u.set_shm_path.shm_path, shm_path,
+			sizeof(lsm.u.set_shm_path.shm_path));
+
+	return lttng_ctl_ask_sessiond(&lsm, NULL);
+}
+
 /*
  *  Ask the session daemon for all available domains of a session.
  *  Sets the contents of the domains array.
@@ -1139,6 +1540,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,
@@ -1168,6 +1570,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));
@@ -1199,6 +1602,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));
@@ -1246,6 +1650,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);
 
@@ -1471,28 +1876,30 @@ int lttng_data_pending(const char *session_name)
 {
 	int ret;
 	struct lttcomm_session_msg lsm;
+	uint8_t *pending = NULL;
 
 	if (session_name == NULL) {
 		return -LTTNG_ERR_INVALID;
 	}
 
+	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_DATA_PENDING;
 
 	lttng_ctl_copy_string(lsm.session.name, session_name,
 			sizeof(lsm.session.name));
 
-	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
-
-	/*
-	 * 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;
+	ret = lttng_ctl_ask_sessiond(&lsm, (void **) &pending);
+	if (ret < 0) {
+		goto end;
+	} else if (ret != 1) {
+		/* Unexpected payload size */
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
 	}
 
+	ret = (int) *pending;
+end:
+	free(pending);
 	return ret;
 }
 
@@ -1544,7 +1951,7 @@ int lttng_create_session_live(const char *name, const char *url,
 	struct lttcomm_session_msg lsm;
 	struct lttng_uri *uris = NULL;
 
-	if (name == NULL) {
+	if (name == NULL || timer_interval == 0) {
 		return -LTTNG_ERR_INVALID;
 	}
 
@@ -1553,16 +1960,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;
@@ -1576,6 +1987,52 @@ end:
 	return ret;
 }
 
+/*
+ * List PIDs in the tracker.
+ *
+ * enabled is set to whether the PID tracker is enabled.
+ * pids is set to an allocated array of PIDs currently tracked. On
+ * success, pids must be freed by the caller.
+ * nr_pids is set to the number of entries contained by the pids array.
+ *
+ * Returns 0 on success, else a negative LTTng error code.
+ */
+int lttng_list_tracker_pids(struct lttng_handle *handle,
+		int *_enabled, int32_t **_pids, size_t *_nr_pids)
+{
+	int ret;
+	int enabled = 1;
+	struct lttcomm_session_msg lsm;
+	size_t nr_pids;
+	int32_t *pids;
+
+	if (handle == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+	lsm.cmd_type = LTTNG_LIST_TRACKER_PIDS;
+	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+			sizeof(lsm.session.name));
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+
+	ret = lttng_ctl_ask_sessiond(&lsm, (void **) &pids);
+	if (ret < 0) {
+		return ret;
+	}
+	nr_pids = ret / sizeof(int32_t);
+	if (nr_pids == 1 && pids[0] == -1) {
+		free(pids);
+		pids = NULL;
+		enabled = 0;
+		nr_pids = 0;
+	}
+	*_enabled = enabled;
+	*_pids = pids;
+	*_nr_pids = nr_pids;
+	return 0;
+}
+
 /*
  * lib constructor
  */