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=107e70b6fa85d897553cb912feefed4d3dc6e491;hb=0c82ac624169ec9ec062f395e55abfe992d0fd91;hpb=9c6bda17fc9edd28c46e52fdf439d37da81e8d9a

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 107e70b6f..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>
@@ -32,12 +32,15 @@
 #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;
@@ -57,7 +60,6 @@ do {								\
 /* 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;
@@ -72,177 +74,13 @@ static int connected;
  */
 int lttng_opt_quiet;
 int lttng_opt_verbose;
-
-/*
- * Compare two URL destination.
- *
- * Return 0 is equal else is not equal.
- */
-static int compare_destination(struct lttng_uri *ctrl, struct lttng_uri *data)
-{
-	int ret;
-
-	assert(ctrl);
-	assert(data);
-
-	switch (ctrl->dtype) {
-	case LTTNG_DST_IPV4:
-		ret = strncmp(ctrl->dst.ipv4, data->dst.ipv4, sizeof(ctrl->dst.ipv4));
-		break;
-	case LTTNG_DST_IPV6:
-		ret = strncmp(ctrl->dst.ipv6, data->dst.ipv6, sizeof(ctrl->dst.ipv6));
-		break;
-	default:
-		ret = -1;
-		break;
-	}
-
-	return ret;
-}
-
-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)
-{
-	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] == '/') {
-		int ret;
-
-		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) {
-		int ret;
-
-		/* 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);
-
-		ret = compare_destination(&ctrl_uris[0], &data_uris[0]);
-		if (ret != 0) {
-			ERR("Control and data destination mismatch");
-			goto error;
-		}
-	}
-
-	/* 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;
-		free(ctrl_uris);
-	}
-
-	if (data_uris) {
-		memcpy(&tmp_uris[idx], data_uris, sizeof(struct lttng_uri));
-		free(data_uris);
-	}
-
-	*uris = tmp_uris;
-
-	return size;
-
-error:
-	free(ctrl_uris);
-	free(data_uris);
-	free(tmp_uris);
-parse_error:
-	return -1;
-}
+int lttng_opt_mi;
 
 /*
  * 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);
@@ -258,17 +96,17 @@ static void copy_string(char *dst, const char *src, size_t 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:
+		case LTTNG_DOMAIN_LOG4J:
+		case LTTNG_DOMAIN_PYTHON:
 			memcpy(dst, src, sizeof(struct lttng_domain));
 			break;
 		default:
@@ -363,12 +201,14 @@ end:
  *
  *  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);
@@ -380,19 +220,19 @@ static int check_tracing_group(const char *grp_name)
 	/* 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;
 	}
 
@@ -434,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;
@@ -459,12 +299,12 @@ static int set_session_daemon_path(void)
 
 	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) {
@@ -485,7 +325,7 @@ static int set_session_daemon_path(void)
 		 * 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;
 		}
@@ -506,6 +346,11 @@ static int connect_sessiond(void)
 {
 	int ret;
 
+	/* Don't try to connect if already connected. */
+	if (connected) {
+		return 0;
+	}
+
 	ret = set_session_daemon_path();
 	if (ret < 0) {
 		goto error;
@@ -549,7 +394,8 @@ static int disconnect_sessiond(void)
  *
  * 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;
@@ -599,7 +445,11 @@ static int 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);
@@ -626,16 +476,6 @@ end:
 	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.
@@ -649,18 +489,18 @@ 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;
 	}
 
 	/* 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;
@@ -687,14 +527,15 @@ int lttng_register_consumer(struct lttng_handle *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);
 }
 
 /*
@@ -709,11 +550,13 @@ int lttng_start_tracing(const char *session_name)
 		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);
 }
 
 /*
@@ -728,11 +571,13 @@ 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;
 
-	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;
 	}
@@ -741,8 +586,6 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
 		goto end;
 	}
 
-	_MSG("Waiting for data availability");
-
 	/* Check for data availability */
 	do {
 		data_ret = lttng_data_pending(session_name);
@@ -758,12 +601,9 @@ static int _lttng_stop_tracing(const char *session_name, int wait)
 		 */
 		if (data_ret) {
 			usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
-			_MSG(".");
 		}
 	} while (data_ret != 0);
 
-	MSG("");
-
 end:
 error:
 	return ret;
@@ -808,18 +648,23 @@ int lttng_add_context(struct lttng_handle *handle,
 
 	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);
 }
 
 /*
@@ -831,36 +676,8 @@ int lttng_add_context(struct lttng_handle *handle,
 int lttng_enable_event(struct lttng_handle *handle,
 		struct lttng_event *ev, const char *channel_name)
 {
-	struct lttcomm_session_msg lsm;
-
-	if (handle == NULL || ev == NULL) {
-		return -LTTNG_ERR_INVALID;
-	}
-
-	memset(&lsm, 0, sizeof(lsm));
-
-	/* If no channel name, we put the default name */
-	if (channel_name == NULL) {
-		copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME,
-				sizeof(lsm.u.enable.channel_name));
-	} else {
-		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;
-	}
-	memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
-
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
-
-	return ask_sessiond(&lsm, NULL);
+	return lttng_enable_event_with_exclusions(handle, ev, channel_name,
+			NULL, 0, NULL);
 }
 
 /*
@@ -873,43 +690,107 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle,
 		struct lttng_event *event, const char *channel_name,
 		const char *filter_expression)
 {
-	struct lttcomm_session_msg lsm;
-	struct filter_parser_ctx *ctx;
-	FILE *fmem;
-	int ret = 0;
+	return lttng_enable_event_with_exclusions(handle, event, channel_name,
+			filter_expression, 0, NULL);
+}
 
-	if (!filter_expression) {
-		/*
-		 * Fall back to normal event enabling if no filter
-		 * specified.
-		 */
-		return lttng_enable_event(handle, event, channel_name);
+/*
+ * 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;
+		}
 	}
 
-	/*
-	 * 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 (handle == NULL || filter_expression[0] == '\0') {
-		return -LTTNG_ERR_INVALID;
+	/* 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.
+	 * 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;
+		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 alloc_error;
+		goto filter_alloc_error;
 	}
 	ret = filter_parser_ctx_append_ast(ctx);
 	if (ret) {
@@ -950,6 +831,12 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle,
 		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... ");
@@ -962,129 +849,414 @@ int lttng_enable_event_with_filter(struct lttng_handle *handle,
 	}
 	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_ENABLE_EVENT_WITH_FILTER;
-
-	/* Copy channel name */
-	copy_string(lsm.u.enable.channel_name, channel_name,
-			sizeof(lsm.u.enable.channel_name));
-	/* Copy event name */
-	if (event) {
-		memcpy(&lsm.u.enable.event, event, sizeof(lsm.u.enable.event));
-	}
-
-	lsm.u.enable.bytecode_len = sizeof(ctx->bytecode->b)
-			+ bytecode_get_len(&ctx->bytecode->b);
-
-	copy_lttng_domain(&lsm.domain, &handle->domain);
-
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
+			bytecode_get_len(&ctx->bytecode->b));
 
-	ret = ask_sessiond_varlen(&lsm, &ctx->bytecode->b,
-				lsm.u.enable.bytecode_len, NULL);
+	lsm->u.enable.bytecode_len = sizeof(ctx->bytecode->b)
+		+ bytecode_get_len(&ctx->bytecode->b);
+	lsm->u.enable.expression_len = strlen(filter_expression) + 1;
 
-	filter_bytecode_free(ctx);
-	filter_ir_free(ctx);
-	filter_parser_ctx_free(ctx);
+	/* No need to keep the memory stream. */
 	if (fclose(fmem) != 0) {
-		perror("fclose");
+		PERROR("fclose");
 	}
-	return ret;
+
+	*ctxp = ctx;
+	return 0;
 
 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");
+		PERROR("fclose");
 	}
+error:
 	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.
+ * 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_disable_event(struct lttng_handle *handle, const char *name,
-		const char *channel_name)
+int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
+		struct lttng_event *ev, const char *channel_name,
+		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;
+	/*
+	 * 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;
 	}
 
-	memset(&lsm, 0, sizeof(lsm));
-
-	if (channel_name) {
-		copy_string(lsm.u.disable.channel_name, channel_name,
-				sizeof(lsm.u.disable.channel_name));
-	} else {
-		copy_string(lsm.u.disable.channel_name, DEFAULT_CHANNEL_NAME,
-				sizeof(lsm.u.disable.channel_name));
+	/* 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;
 	}
 
-	copy_lttng_domain(&lsm.domain, &handle->domain);
+	memset(&lsm, 0, sizeof(lsm));
 
-	if (name != NULL) {
-		copy_string(lsm.u.disable.name, name, sizeof(lsm.u.disable.name));
-		lsm.cmd_type = LTTNG_DISABLE_EVENT;
+	/* If no channel name, send empty string. */
+	if (channel_name == NULL) {
+		lttng_ctl_copy_string(lsm.u.enable.channel_name, "",
+				sizeof(lsm.u.enable.channel_name));
 	} else {
-		lsm.cmd_type = LTTNG_DISABLE_ALL_EVENT;
+		lttng_ctl_copy_string(lsm.u.enable.channel_name, channel_name,
+				sizeof(lsm.u.enable.channel_name));
 	}
 
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
+	lsm.cmd_type = LTTNG_ENABLE_EVENT;
+	if (ev->name[0] == '\0') {
+		/* Enable all events */
+		lttng_ctl_copy_string(ev->name, "*", sizeof(ev->name));
+	}
 
-	return ask_sessiond(&lsm, NULL);
-}
+	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));
 
-/*
- *  Enable channel per domain
- *  Returns size of returned session payload data or a negative error code.
- */
-int lttng_enable_channel(struct lttng_handle *handle,
-		struct lttng_channel *chan)
-{
-	struct lttcomm_session_msg lsm;
+	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;
 
 	/*
-	 * NULL arguments are forbidden. No default values.
+	 * 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 (handle == NULL || chan == NULL) {
-		return -LTTNG_ERR_INVALID;
+	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;
 	}
 
-	memset(&lsm, 0, sizeof(lsm));
-
-	memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
+	/*
+	 * 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
+	 */
 
-	lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
+	/* 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 an agent filter, the original filter has been added to
+				 * it thus replace the filter expression.
+				 */
+				filter_expression = agent_filter;
+				free_filter_expression = 1;
+			}
+		}
 
-	copy_lttng_domain(&lsm.domain, &handle->domain);
+		ret = generate_filter(filter_expression, &lsm, &ctx);
+		if (ret) {
+			goto filter_error;
+		}
+	}
 
-	copy_string(lsm.session.name, handle->session_name,
-			sizeof(lsm.session.name));
+	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;
+	}
+
+	/* 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 + lsm.u.enable.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;
 
-	return ask_sessiond(&lsm, NULL);
+ask_sessiond:
+	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
+	return ret;
 }
 
-/*
- *  All tracing will be stopped for registered events of the channel.
- *  Returns size of returned session payload data or a negative error code.
- */
-int lttng_disable_channel(struct lttng_handle *handle, const char *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;
 
-	/* Safety check. Both are mandatory */
+	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));
+
+	/* 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 {
+		lttng_ctl_copy_string(lsm.u.disable.channel_name, channel_name,
+				sizeof(lsm.u.disable.channel_name));
+	}
+
+	lsm.cmd_type = LTTNG_DISABLE_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;
+
+	/*
+	 * 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);
+}
+
+/*
+ *  Enable channel per domain
+ *  Returns size of returned session payload data or a negative error code.
+ */
+int lttng_enable_channel(struct lttng_handle *handle,
+		struct lttng_channel *chan)
+{
+	struct lttcomm_session_msg lsm;
+
+	/*
+	 * NULL arguments are forbidden. No default values.
+	 */
+	if (handle == NULL || chan == NULL) {
+		return -LTTNG_ERR_INVALID;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+
+	memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
+
+	lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
+
+	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);
+}
+
+/*
+ *  All tracing will be stopped for registered events of the channel.
+ *  Returns size of returned session payload data or a negative error code.
+ */
+int lttng_disable_channel(struct lttng_handle *handle, const char *name)
+{
+	struct lttcomm_session_msg lsm;
+
+	/* Safety check. Both are mandatory */
 	if (handle == NULL || name == NULL) {
 		return -LTTNG_ERR_INVALID;
 	}
@@ -1093,15 +1265,71 @@ int lttng_disable_channel(struct lttng_handle *handle, const char *name)
 
 	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);
+
+	lttng_ctl_copy_string(lsm.session.name, handle->session_name,
+			sizeof(lsm.session.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;
 
-	copy_string(lsm.session.name, handle->session_name,
+	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
+
+	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);
 }
 
 /*
@@ -1120,10 +1348,11 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 		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;
 	}
@@ -1147,10 +1376,11 @@ 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;
-	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;
 	}
@@ -1158,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).
@@ -1186,18 +1445,18 @@ int lttng_create_session(const char *name, const char *url)
 	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;
 
-	ret = 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;
@@ -1215,11 +1474,13 @@ int lttng_destroy_session(const char *session_name)
 		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);
 }
 
 /*
@@ -1233,8 +1494,9 @@ 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 = ask_sessiond(&lsm, (void**) sessions);
+	ret = lttng_ctl_ask_sessiond(&lsm, (void**) sessions);
 	if (ret < 0) {
 		return ret;
 	}
@@ -1242,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.
@@ -1258,11 +1540,13 @@ int lttng_list_domains(const char *session_name,
 		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;
 	}
@@ -1286,13 +1570,14 @@ int lttng_list_channels(struct lttng_handle *handle,
 		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;
 	}
@@ -1317,15 +1602,16 @@ int lttng_list_events(struct lttng_handle *handle,
 		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;
 	}
@@ -1364,12 +1650,13 @@ int lttng_calibrate(struct lttng_handle *handle,
 		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);
 }
 
 /*
@@ -1386,34 +1673,37 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 
 	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;
-		attr->tracefile_size = DEFAULT_KERNEL_CHANNEL_TRACEFILE_SIZE;
-		attr->tracefile_count = DEFAULT_KERNEL_CHANNEL_TRACEFILE_COUNT;
 		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;
-		attr->tracefile_size = DEFAULT_UST_CHANNEL_TRACEFILE_SIZE;
-		attr->tracefile_count = DEFAULT_UST_CHANNEL_TRACEFILE_COUNT;
-		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;
@@ -1475,19 +1765,19 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 
 	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;
 
-	ret = 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;
@@ -1509,99 +1799,6 @@ int lttng_disable_consumer(struct lttng_handle *handle)
 	return -ENOSYS;
 }
 
-/*
- * 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 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) {
-		int ret;
-
-		/*
-		 * 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;
-}
-
 /*
  * This is an extension of create session that is ONLY and SHOULD only be used
  * by the lttng command line program. It exists to avoid using URI parsing in
@@ -1628,17 +1825,17 @@ int _lttng_create_session_ext(const char *name, const char *url,
 	struct lttcomm_session_msg lsm;
 	struct lttng_uri *uris = NULL;
 
-	if (name == NULL || datetime == NULL || url == NULL) {
+	if (name == NULL || datetime == NULL) {
 		return -LTTNG_ERR_INVALID;
 	}
 
 	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) {
 		ret = -LTTNG_ERR_INVALID;
 		goto error;
@@ -1647,8 +1844,14 @@ int _lttng_create_session_ext(const char *name, const char *url,
 	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");
 			ret = -LTTNG_ERR_FATAL;
@@ -1656,8 +1859,8 @@ int _lttng_create_session_ext(const char *name, const char *url,
 		}
 	}
 
-	ret = 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);
@@ -1673,29 +1876,163 @@ 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;
 
-	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, (void **) &pending);
+	if (ret < 0) {
+		goto end;
+	} else if (ret != 1) {
+		/* Unexpected payload size */
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
 
-	/*
-	 * 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.
-	 */
-	if (ret == -1) {
-		ret = 1;
+	ret = (int) *pending;
+end:
+	free(pending);
+	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 || timer_interval == 0) {
+		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;
+}
+
+/*
+ * 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
  */
@@ -1703,8 +2040,6 @@ static void __attribute__((constructor)) init()
 {
 	/* Set default session group */
 	lttng_set_tracing_group(DEFAULT_TRACING_GROUP);
-	/* Set socket for health check */
-	(void) set_health_socket_path();
 }
 
 /*