X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=8fb79d3786c577842475ea9724f92293ec591800;hp=32aff65d35f7c07dd2ad60982b266c2f8c72c259;hb=1004b7191b421c7c07acf964d0110d93bb022699;hpb=702f26c8641ee4554c629d13b9367b1e93f96e31

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 32aff65d3..8fb79d378 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -15,8 +15,10 @@
 
 #include "common/argpar/argpar.h"
 #include "common/dynamic-array.h"
+#include "common/mi-lttng.h"
 #include "common/string-utils/string-utils.h"
 #include "common/utils.h"
+#include <lttng/domain-internal.h>
 /* For lttng_event_rule_type_str(). */
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/lttng.h>
@@ -46,11 +48,10 @@ enum {
 
 	OPT_NAME,
 	OPT_FILTER,
-	OPT_EXCLUDE_NAMES,
+	OPT_EXCLUDE_NAME,
 	OPT_EVENT_NAME,
 	OPT_LOG_LEVEL,
 
-	OPT_DOMAIN,
 	OPT_TYPE,
 	OPT_LOCATION,
 
@@ -66,11 +67,10 @@ enum {
 static const struct argpar_opt_descr event_rule_opt_descrs[] = {
 	{ OPT_FILTER, 'f', "filter", true },
 	{ OPT_NAME, 'n', "name", true },
-	{ OPT_EXCLUDE_NAMES, 'x', "exclude-names", true },
+	{ OPT_EXCLUDE_NAME, 'x', "exclude-name", true },
 	{ OPT_LOG_LEVEL, 'l', "log-level", true },
 	{ OPT_EVENT_NAME, 'E', "event-name", true },
 
-	{ OPT_DOMAIN, 'd', "domain", true },
 	{ OPT_TYPE, 't', "type", true },
 	{ OPT_LOCATION, 'L', "location", true },
 
@@ -81,38 +81,27 @@ static const struct argpar_opt_descr event_rule_opt_descrs[] = {
 };
 
 static
-bool assign_domain_type(enum lttng_domain_type *dest, const char *arg)
+bool has_syscall_prefix(const char *arg)
 {
-	bool ret;
-
-	if (*dest != LTTNG_DOMAIN_NONE) {
-		ERR("More than one `--domain` was specified.");
-		goto error;
-	}
-
-	if (strcmp(arg, "kernel") == 0) {
-		*dest = LTTNG_DOMAIN_KERNEL;
-	} else if (strcmp(arg, "user") == 0 || strcmp(arg, "userspace") == 0) {
-		*dest = LTTNG_DOMAIN_UST;
-	} else if (strcmp(arg, "jul") == 0) {
-		*dest = LTTNG_DOMAIN_JUL;
-	} else if (strcmp(arg, "log4j") == 0) {
-		*dest = LTTNG_DOMAIN_LOG4J;
-	} else if (strcmp(arg, "python") == 0) {
-		*dest = LTTNG_DOMAIN_PYTHON;
+	bool matches = false;
+	const char kernel_syscall_type_opt_prefix[] = "kernel:syscall";
+	const size_t kernel_syscall_type_opt_prefix_len =
+			sizeof(kernel_syscall_type_opt_prefix) - 1;
+	const char syscall_type_opt_prefix[] = "syscall";
+	const size_t syscall_type_opt_prefix_len =
+			sizeof(syscall_type_opt_prefix) - 1;
+
+	if (strncmp(arg, syscall_type_opt_prefix,
+			    syscall_type_opt_prefix_len) == 0) {
+		matches = true;
+	} else if (strncmp(arg, kernel_syscall_type_opt_prefix,
+				   kernel_syscall_type_opt_prefix_len) == 0) {
+		matches = true;
 	} else {
-		ERR("Invalid `--domain` value: %s", arg);
-		goto error;
+		matches = false;
 	}
 
-	ret = true;
-	goto end;
-
-error:
-	ret = false;
-
-end:
-	return ret;
+	return matches;
 }
 
 static
@@ -125,17 +114,25 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg)
 		goto error;
 	}
 
-	if (strcmp(arg, "tracepoint") == 0 || strcmp(arg, "logging") == 0) {
-		*dest = LTTNG_EVENT_RULE_TYPE_TRACEPOINT;
+	if (strcmp(arg, "user") == 0 || strcmp(arg, "user:tracepoint") == 0) {
+		*dest = LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT;
+	} else if (strcmp(arg, "kernel") == 0 ||
+			strcmp(arg, "kernel:tracepoint") == 0) {
+		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT;
+	} else if (strcmp(arg, "jul") == 0 || strcmp(arg, "jul:logging") == 0) {
+		*dest = LTTNG_EVENT_RULE_TYPE_JUL_LOGGING;
+	} else if (strcmp(arg, "log4j") == 0 ||
+			strcmp(arg, "log4j:logging") == 0) {
+		*dest = LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING;
+	} else if (strcmp(arg, "python") == 0 ||
+			strcmp(arg, "python:logging") == 0) {
+		*dest = LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING;
 	} else if (strcmp(arg, "kprobe") == 0 ||
-			strcmp(arg, "kernel-probe") == 0) {
-		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE;
-	} else if (strcmp(arg, "uprobe") == 0 ||
-			strcmp(arg, "userspace-probe") == 0) {
-		*dest = LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE;
-	} else if (strcmp(arg, "function") == 0) {
-		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION;
-	} else if (strncmp(arg, "syscall", strlen("syscall")) == 0) {
+			strcmp(arg, "kernel:kprobe") == 0) {
+		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE;
+	} else if (strcmp(arg, "kernel:uprobe") == 0) {
+		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE;
+	} else if (has_syscall_prefix(arg)) {
 		/*
 		 * Matches the following:
 		 *   - syscall
@@ -143,10 +140,15 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg)
 		 *   - syscall:exit
 		 *   - syscall:entry+exit
 		 *   - syscall:*
+		 *   - kernel:syscall
+		 *   - kernel:syscall:entry
+		 *   - kernel:syscall:exit
+		 *   - kernel:syscall:entry+exit
+		 *   - kernel:syscall:*
 		 *
 		 * Validation for the right side is left to further usage sites.
 		 */
-		*dest = LTTNG_EVENT_RULE_TYPE_SYSCALL;
+		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL;
 	} else {
 		ERR("Invalid `--type` value: %s", arg);
 		goto error;
@@ -189,16 +191,27 @@ end:
 }
 
 static bool parse_syscall_emission_site_from_type(const char *str,
-		enum lttng_event_rule_syscall_emission_site_type *type)
+		enum lttng_event_rule_kernel_syscall_emission_site *type)
 {
 	bool ret = false;
+	const char kernel_prefix[] = "kernel:";
+	const size_t kernel_prefix_len = sizeof(kernel_prefix) - 1;
+
+	/*
+	 * If the passed string is of the form "kernel:syscall*", move the
+	 * pointer passed "kernel:".
+	 */
+	if (strncmp(str, kernel_prefix, kernel_prefix_len) == 0) {
+		str = &str[kernel_prefix_len];
+	}
+
 	if (strcmp(str, "syscall") == 0 ||
 			strcmp(str, "syscall:entry+exit") == 0) {
-		*type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT;
+		*type = LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY_EXIT;
 	} else if (strcmp(str, "syscall:entry") == 0) {
-		*type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY;
+		*type = LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY;
 	} else if (strcmp(str, "syscall:exit") == 0) {
-		*type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_EXIT;
+		*type = LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_EXIT;
 	} else {
 		goto error;
 	}
@@ -209,14 +222,8 @@ error:
 	return ret;
 }
 
-/* This is defined in enable_events.c. */
-LTTNG_HIDDEN
-int create_exclusion_list_and_validate(const char *event_name,
-		const char *exclusions_arg,
-		char ***exclusion_list);
-
 /*
- * Parse `str` as a log level in domain `domain_type`.
+ * Parse `str` as a log level against the passed event rule type.
  *
  * Return the log level in `*log_level`.  Return true in `*log_level_only` if
  * the string specifies exactly this log level, false if it specifies at least
@@ -225,14 +232,14 @@ int create_exclusion_list_and_validate(const char *event_name,
  * Return true if the string was successfully parsed as a log level string.
  */
 static bool parse_log_level_string(const char *str,
-		enum lttng_domain_type domain_type,
+		enum lttng_event_rule_type event_rule_type,
 		int *log_level,
 		bool *log_level_only)
 {
 	bool ret;
 
-	switch (domain_type) {
-	case LTTNG_DOMAIN_UST:
+	switch (event_rule_type) {
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
 	{
 		enum lttng_loglevel log_level_min, log_level_max;
 		if (!loglevel_parse_range_string(
@@ -250,7 +257,7 @@ static bool parse_log_level_string(const char *str,
 		*log_level_only = log_level_min == log_level_max;
 		break;
 	}
-	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
 	{
 		enum lttng_loglevel_log4j log_level_min, log_level_max;
 		if (!loglevel_log4j_parse_range_string(
@@ -268,7 +275,7 @@ static bool parse_log_level_string(const char *str,
 		*log_level_only = log_level_min == log_level_max;
 		break;
 	}
-	case LTTNG_DOMAIN_JUL:
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
 	{
 		enum lttng_loglevel_jul log_level_min, log_level_max;
 		if (!loglevel_jul_parse_range_string(
@@ -286,7 +293,7 @@ static bool parse_log_level_string(const char *str,
 		*log_level_only = log_level_min == log_level_max;
 		break;
 	}
-	case LTTNG_DOMAIN_PYTHON:
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
 	{
 		enum lttng_loglevel_python log_level_min, log_level_max;
 		if (!loglevel_python_parse_range_string(
@@ -642,7 +649,6 @@ struct parse_event_rule_res {
 static
 struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 {
-	enum lttng_domain_type domain_type = LTTNG_DOMAIN_NONE;
 	enum lttng_event_rule_type event_rule_type =
 			LTTNG_EVENT_RULE_TYPE_UNKNOWN;
 	struct argpar_state *state;
@@ -661,8 +667,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 
 	/* Tracepoint and syscall options. */
 	char *name = NULL;
-	char *exclude_names = NULL;
-	char **exclusion_list = NULL;
+	/* Array of strings. */
+	struct lttng_dynamic_pointer_array exclude_names;
 
 	/* For userspace / kernel probe and function. */
 	char *location = NULL;
@@ -676,6 +682,9 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 
 	lttng_dynamic_pointer_array_init(&res.capture_descriptors,
 				destroy_event_expr);
+
+	lttng_dynamic_pointer_array_init(&exclude_names, free);
+
 	state = argpar_state_create(*argc, *argv, event_rule_opt_descrs);
 	if (!state) {
 		ERR("Failed to allocate an argpar state.");
@@ -704,14 +713,6 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 					(const struct argpar_item_opt *) item;
 
 			switch (item_opt->descr->id) {
-			/* Domains. */
-			case OPT_DOMAIN:
-				if (!assign_domain_type(&domain_type,
-						item_opt->arg)) {
-					goto error;
-				}
-
-				break;
 			case OPT_TYPE:
 				if (!assign_event_rule_type(&event_rule_type,
 						item_opt->arg)) {
@@ -756,14 +757,20 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 				}
 
 				break;
-			case OPT_EXCLUDE_NAMES:
-				if (!assign_string(&exclude_names,
-						    item_opt->arg,
-						    "--exclude-names/-x")) {
+			case OPT_EXCLUDE_NAME:
+			{
+				int ret;
+
+				ret = lttng_dynamic_pointer_array_add_pointer(
+						&exclude_names,
+						strdup(item_opt->arg));
+				if (ret != 0) {
+					ERR("Failed to add pointer to dynamic pointer array.");
 					goto error;
 				}
 
 				break;
+			}
 			case OPT_LOG_LEVEL:
 				if (!assign_string(&log_level_str,
 						    item_opt->arg, "--log-level/-l")) {
@@ -825,17 +832,21 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 	}
 
 	if (event_rule_type == LTTNG_EVENT_RULE_TYPE_UNKNOWN) {
-		event_rule_type = LTTNG_EVENT_RULE_TYPE_TRACEPOINT;
+		event_rule_type = LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT;
 	}
 
 	/*
-	 * Option --name is applicable to event rules of type tracepoint
-	 * and syscall.  For tracepoint and syscall rules, if --name is
-	 * omitted, it is implicitly "*".
+	 * Option --name is applicable to event rules of type kernel, user, jul,
+	 * log4j,python and syscall.  If --name is omitted, it is implicitly
+	 * "*".
 	 */
 	switch (event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 		if (!name) {
 			name = strdup("*");
 		}
@@ -849,8 +860,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		if (exclude_names) {
-			ERR("Can't use --exclude-names/-x with %s event rules.",
+		if (lttng_dynamic_pointer_array_get_count(&exclude_names) > 0) {
+			ERR("Can't use --exclude-name/-x with %s event rules.",
 					lttng_event_rule_type_str(
 							event_rule_type));
 			goto error;
@@ -865,9 +876,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 	 * If omitted, it defaults to the location.
 	 */
 	switch (event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
-	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 		if (!location) {
 			ERR("Event rule of type %s requires a --location.",
 			lttng_event_rule_type_str(event_rule_type));
@@ -903,40 +913,19 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 	*argc -= consumed_args;
 	*argv += consumed_args;
 
-	/* Need to specify a domain. */
-	if (domain_type == LTTNG_DOMAIN_NONE) {
-		ERR("Please specify a domain (--domain=(kernel,user,jul,log4j,python)).");
-		goto error;
-	}
-
-	/* Validate event rule type against domain. */
-	switch (event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-		if (domain_type != LTTNG_DOMAIN_KERNEL) {
-			ERR("Event type not available for user-space tracing.");
-			goto error;
-		}
-		break;
-
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		break;
-
-	default:
-		abort();
-	}
-
 	/*
 	 * Adding a filter to a probe, function or userspace-probe would be
 	 * denied by the kernel tracer as it's not supported at the moment. We
 	 * do an early check here to warn the user.
 	 */
-	if (filter && domain_type == LTTNG_DOMAIN_KERNEL) {
+	if (filter) {
 		switch (event_rule_type) {
-		case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+		case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+		case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+		case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+		case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+		case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 			break;
 		default:
 			ERR("Filter expressions are not supported for %s event rules.",
@@ -945,110 +934,205 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 		}
 	}
 
-	/* If --exclude/-x was passed, split it into an exclusion list. */
-	if (exclude_names) {
-		if (domain_type != LTTNG_DOMAIN_UST) {
+	/*
+	 * If --exclude-name/-x was passed, split it into an exclusion list.
+	 * Exclusions are only supported by
+	 * LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT for now.
+	 */
+	if (lttng_dynamic_pointer_array_get_count(&exclude_names) > 0) {
+		if (event_rule_type != LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT) {
 			ERR("Event name exclusions are not yet implemented for %s event rules.",
-					get_domain_str(domain_type));
+					lttng_event_rule_type_str(event_rule_type));
 			goto error;
 		}
 
-		if (create_exclusion_list_and_validate(name,
-				    exclude_names, &exclusion_list) != 0) {
-			ERR("Failed to create exclusion list.");
+		if (validate_exclusion_list(name, &exclude_names) != 0) {
+			/*
+			 * Assume validate_exclusion_list already prints an
+			 * error message.
+			 */
 			goto error;
 		}
 	}
 
 	if (log_level_str) {
-		if (event_rule_type != LTTNG_EVENT_RULE_TYPE_TRACEPOINT) {
-			ERR("Log levels are only applicable to tracepoint event rules.");
-			goto error;
-		}
+		switch (event_rule_type) {
+		case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+		case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+		case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+		{
+			int log_level;
+			bool log_level_only;
 
-		if (domain_type == LTTNG_DOMAIN_KERNEL) {
-			ERR("Log levels are not supported by the kernel tracer.");
+			if (strcmp(log_level_str, "..") == 0) {
+				/*
+				 * ".." is the same as passing no log level
+				 * option and correspond to the "ANY" case.
+				 */
+				break;
+			}
+
+			if (!parse_log_level_string(log_level_str, event_rule_type,
+					    &log_level, &log_level_only)) {
+				ERR("Failed to parse log level string `%s`.",
+						log_level_str);
+				goto error;
+			}
+
+			if (log_level_only) {
+				log_level_rule = lttng_log_level_rule_exactly_create(log_level);
+			} else {
+				log_level_rule = lttng_log_level_rule_at_least_as_severe_as_create(log_level);
+			}
+
+			if (log_level_rule == NULL) {
+				ERR("Failed to create log level rule object.");
+				goto error;
+			}
+			break;
+		}
+		default:
+			ERR("Log levels are not supported for %s event rules.",
+					lttng_event_rule_type_str(event_rule_type));
 			goto error;
 		}
 	}
 
 	/* Finally, create the event rule object. */
 	switch (event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
 	{
 		enum lttng_event_rule_status event_rule_status;
 
-		res.er = lttng_event_rule_tracepoint_create(domain_type);
+		res.er = lttng_event_rule_user_tracepoint_create();
 		if (!res.er) {
-			ERR("Failed to create tracepoint event rule.");
+			ERR("Failed to create user_tracepoint event rule.");
 			goto error;
 		}
 
 		/* Set pattern. */
-		event_rule_status = lttng_event_rule_tracepoint_set_pattern(
+		event_rule_status = lttng_event_rule_user_tracepoint_set_name_pattern(
 				res.er, name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
-			ERR("Failed to set tracepoint event rule's pattern to '%s'.",
+			ERR("Failed to set user_tracepoint event rule's pattern to '%s'.",
 					name);
 			goto error;
 		}
 
 		/* Set filter. */
 		if (filter) {
-			event_rule_status = lttng_event_rule_tracepoint_set_filter(
+			event_rule_status = lttng_event_rule_user_tracepoint_set_filter(
 					res.er, filter);
 			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
-				ERR("Failed to set tracepoint event rule's filter to '%s'.",
+				ERR("Failed to set user_tracepoint event rule's filter to '%s'.",
 						filter);
 				goto error;
 			}
 		}
 
 		/* Set exclusion list. */
-		if (exclusion_list) {
+		if (lttng_dynamic_pointer_array_get_count(&exclude_names) > 0) {
 			int n;
-
-			for (n = 0; exclusion_list[n]; n++) {
-				event_rule_status = lttng_event_rule_tracepoint_add_exclusion(
-						res.er,
-						exclusion_list[n]);
+			int count = lttng_dynamic_pointer_array_get_count(
+					&exclude_names);
+
+			for (n = 0; n < count; n++) {
+				const char *exclude_name =
+						lttng_dynamic_pointer_array_get_pointer(
+								&exclude_names,
+								n);
+
+				event_rule_status =
+						lttng_event_rule_user_tracepoint_add_name_pattern_exclusion(
+								res.er,
+								exclude_name);
 				if (event_rule_status !=
 						LTTNG_EVENT_RULE_STATUS_OK) {
-					ERR("Failed to set tracepoint exclusion list element '%s'",
-							exclusion_list[n]);
+					ERR("Failed to set user_tracepoint exclusion list element '%s'",
+							exclude_name);
 					goto error;
 				}
 			}
 		}
 
-		/*
-		 * ".." is the same as passing no log level option and
-		 * correspond the the "ANY" case.
-		 */
-		if (log_level_str && strcmp(log_level_str, "..") != 0) {
-			int log_level;
-			bool log_level_only;
+		if (log_level_rule) {
+			event_rule_status =
+					lttng_event_rule_user_tracepoint_set_log_level_rule(
+							res.er, log_level_rule);
 
-			if (!parse_log_level_string(log_level_str, domain_type,
-					    &log_level, &log_level_only)) {
-				ERR("Failed to parse log level string `%s`.",
-						log_level_str);
+			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+				ERR("Failed to set log level on event fule.");
 				goto error;
 			}
+		}
 
-			if (log_level_only) {
-				log_level_rule = lttng_log_level_rule_exactly_create(log_level);
-			} else {
-				log_level_rule = lttng_log_level_rule_at_least_as_severe_as_create(log_level);
+		break;
+	}
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+	{
+		enum lttng_event_rule_status event_rule_status;
+
+		res.er = lttng_event_rule_kernel_tracepoint_create();
+		if (!res.er) {
+			ERR("Failed to create kernel_tracepoint event rule.");
+			goto error;
+		}
+
+		/* Set pattern. */
+		event_rule_status = lttng_event_rule_kernel_tracepoint_set_name_pattern(
+				res.er, name);
+		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+			ERR("Failed to set kernel_tracepoint event rule's pattern to '%s'.",
+					name);
+			goto error;
+		}
+
+		/* Set filter. */
+		if (filter) {
+			event_rule_status = lttng_event_rule_kernel_tracepoint_set_filter(
+					res.er, filter);
+			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+				ERR("Failed to set kernel_tracepoint event rule's filter to '%s'.",
+						filter);
+				goto error;
 			}
+		}
+		break;
+	}
+	case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+	{
+		enum lttng_event_rule_status event_rule_status;
 
-			if (log_level_rule == NULL) {
-				ERR("Failed to create log level rule object.");
+		res.er = lttng_event_rule_jul_logging_create();
+		if (!res.er) {
+			ERR("Failed to create jul_logging event rule.");
+			goto error;
+		}
+
+		/* Set pattern. */
+		event_rule_status = lttng_event_rule_jul_logging_set_name_pattern(
+				res.er, name);
+		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+			ERR("Failed to set jul_logging event rule's pattern to '%s'.",
+					name);
+			goto error;
+		}
+
+		/* Set filter. */
+		if (filter) {
+			event_rule_status = lttng_event_rule_jul_logging_set_filter(
+					res.er, filter);
+			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+				ERR("Failed to set jul_logging event rule's filter to '%s'.",
+						filter);
 				goto error;
 			}
+		}
 
+		if (log_level_rule) {
 			event_rule_status =
-					lttng_event_rule_tracepoint_set_log_level_rule(
+					lttng_event_rule_jul_logging_set_log_level_rule(
 							res.er, log_level_rule);
 
 			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
@@ -1056,10 +1140,93 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 				goto error;
 			}
 		}
+		break;
+	}
+	case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+	{
+		enum lttng_event_rule_status event_rule_status;
+
+		res.er = lttng_event_rule_log4j_logging_create();
+		if (!res.er) {
+			ERR("Failed to create jul_logging event rule.");
+			goto error;
+		}
+
+		/* Set pattern. */
+		event_rule_status = lttng_event_rule_log4j_logging_set_name_pattern(
+				res.er, name);
+		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+			ERR("Failed to set jul_logging event rule's pattern to '%s'.",
+					name);
+			goto error;
+		}
 
+		/* Set filter. */
+		if (filter) {
+			event_rule_status = lttng_event_rule_log4j_logging_set_filter(
+					res.er, filter);
+			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+				ERR("Failed to set jul_logging event rule's filter to '%s'.",
+						filter);
+				goto error;
+			}
+		}
+
+		if (log_level_rule) {
+			event_rule_status =
+					lttng_event_rule_log4j_logging_set_log_level_rule(
+							res.er, log_level_rule);
+
+			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+				ERR("Failed to set log level on event fule.");
+				goto error;
+			}
+		}
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+	case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+	{
+		enum lttng_event_rule_status event_rule_status;
+
+		res.er = lttng_event_rule_python_logging_create();
+		if (!res.er) {
+			ERR("Failed to create jul_logging event rule.");
+			goto error;
+		}
+
+		/* Set pattern. */
+		event_rule_status = lttng_event_rule_python_logging_set_name_pattern(
+				res.er, name);
+		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+			ERR("Failed to set jul_logging event rule's pattern to '%s'.",
+					name);
+			goto error;
+		}
+
+		/* Set filter. */
+		if (filter) {
+			event_rule_status = lttng_event_rule_python_logging_set_filter(
+					res.er, filter);
+			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+				ERR("Failed to set jul_logging event rule's filter to '%s'.",
+						filter);
+				goto error;
+			}
+		}
+
+		if (log_level_rule) {
+			event_rule_status =
+					lttng_event_rule_python_logging_set_log_level_rule(
+							res.er, log_level_rule);
+
+			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+				ERR("Failed to set log level on event fule.");
+				goto error;
+			}
+		}
+		break;
+	}
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 	{
 		int ret;
 		enum lttng_event_rule_status event_rule_status;
@@ -1072,14 +1239,14 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 		}
 
 		assert(kernel_probe_location);
-		res.er = lttng_event_rule_kernel_probe_create(kernel_probe_location);
+		res.er = lttng_event_rule_kernel_kprobe_create(kernel_probe_location);
 		if (!res.er) {
 			ERR("Failed to create kprobe event rule.");
 			goto error;
 		}
 
 		event_rule_status =
-				lttng_event_rule_kernel_probe_set_event_name(
+				lttng_event_rule_kernel_kprobe_set_event_name(
 						res.er, event_name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set kprobe event rule's name to '%s'.",
@@ -1089,7 +1256,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 	{
 		int ret;
 		enum lttng_event_rule_status event_rule_status;
@@ -1101,14 +1268,14 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		res.er = lttng_event_rule_userspace_probe_create(userspace_probe_location);
+		res.er = lttng_event_rule_kernel_uprobe_create(userspace_probe_location);
 		if (!res.er) {
 			ERR("Failed to create userspace probe event rule.");
 			goto error;
 		}
 
 		event_rule_status =
-				lttng_event_rule_userspace_probe_set_event_name(
+				lttng_event_rule_kernel_uprobe_set_event_name(
 						res.er, event_name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set user space probe event rule's name to '%s'.",
@@ -1118,24 +1285,24 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 	{
 		enum lttng_event_rule_status event_rule_status;
-		enum lttng_event_rule_syscall_emission_site_type emission_site_type;
+		enum lttng_event_rule_kernel_syscall_emission_site emission_site;
 
 		if (!parse_syscall_emission_site_from_type(
-				    event_rule_type_str, &emission_site_type)) {
+				    event_rule_type_str, &emission_site)) {
 			ERR("Failed to parse syscall type '%s'.", event_rule_type_str);
 			goto error;
 		}
 
-		res.er = lttng_event_rule_syscall_create(emission_site_type);
+		res.er = lttng_event_rule_kernel_syscall_create(emission_site);
 		if (!res.er) {
 			ERR("Failed to create syscall event rule.");
 			goto error;
 		}
 
-		event_rule_status = lttng_event_rule_syscall_set_pattern(
+		event_rule_status = lttng_event_rule_kernel_syscall_set_name_pattern(
 				res.er, name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set syscall event rule's pattern to '%s'.",
@@ -1144,7 +1311,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 		}
 
 		if (filter) {
-			event_rule_status = lttng_event_rule_syscall_set_filter(
+			event_rule_status = lttng_event_rule_kernel_syscall_set_filter(
 					res.er, filter);
 			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 				ERR("Failed to set syscall event rule's filter to '%s'.",
@@ -1178,13 +1345,12 @@ end:
 	argpar_state_destroy(state);
 	free(filter);
 	free(name);
-	free(exclude_names);
+	lttng_dynamic_pointer_array_reset(&exclude_names);
 	free(log_level_str);
 	free(location);
 	free(event_name);
 	free(event_rule_type_str);
 
-	strutils_free_null_terminated_array_of_strings(exclusion_list);
 	lttng_kernel_probe_location_destroy(kernel_probe_location);
 	lttng_userspace_probe_location_destroy(userspace_probe_location);
 	lttng_log_level_rule_destroy(log_level_rule);
@@ -1291,8 +1457,9 @@ end:
 
 static struct lttng_rate_policy *parse_rate_policy(const char *policy_str)
 {
-	int num_token;
-	char **tokens = NULL;
+	int ret;
+	size_t num_token = 0;
+	struct lttng_dynamic_pointer_array tokens;
 	struct lttng_rate_policy *policy = NULL;
 	enum lttng_rate_policy_type policy_type;
 	unsigned long long value;
@@ -1300,12 +1467,13 @@ static struct lttng_rate_policy *parse_rate_policy(const char *policy_str)
 	char *policy_value_str;
 
 	assert(policy_str);
+	lttng_dynamic_pointer_array_init(&tokens, NULL);
 
-	/*
-	 * rate policy fields are separated by ':'.
-	 */
-	tokens = strutils_split(policy_str, ':', 1);
-	num_token = strutils_array_of_strings_len(tokens);
+	/* Rate policy fields are separated by ':'. */
+	ret = strutils_split(policy_str, ':', 1, &tokens);
+	if (ret == 0) {
+		num_token = lttng_dynamic_pointer_array_get_count(&tokens);
+	}
 
 	/*
 	 * Early sanity check that the number of parameter is exactly 2.
@@ -1316,8 +1484,8 @@ static struct lttng_rate_policy *parse_rate_policy(const char *policy_str)
 		goto end;
 	}
 
-	policy_type_str = tokens[0];
-	policy_value_str = tokens[1];
+	policy_type_str = lttng_dynamic_pointer_array_get_pointer(&tokens, 0);
+	policy_value_str = lttng_dynamic_pointer_array_get_pointer(&tokens, 1);
 
 	/* Parse the type. */
 	if (strcmp(policy_type_str, "once-after") == 0) {
@@ -1357,7 +1525,7 @@ static struct lttng_rate_policy *parse_rate_policy(const char *policy_str)
 	}
 
 end:
-	strutils_free_null_terminated_array_of_strings(tokens);
+	lttng_dynamic_pointer_array_reset(&tokens);
 	return policy;
 }
 
@@ -1491,7 +1659,7 @@ static struct lttng_action *handle_action_simple_session_with_policy(int *argc,
 		{ OPT_RATE_POLICY, '\0', "rate-policy", true },
 		ARGPAR_OPT_DESCR_SENTINEL
 	};
-	
+
 	state = argpar_state_create(*argc, *argv, rate_policy_opt_descrs);
 	if (!state) {
 		ERR("Failed to allocate an argpar state.");
@@ -2019,9 +2187,36 @@ int cmd_add_trigger(int argc, const char **argv)
 	char *name = NULL;
 	int i;
 	char *owner_uid = NULL;
+	enum lttng_error_code ret_code;
+	struct mi_writer *mi_writer = NULL;
 
 	lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
 
+	if (lttng_opt_mi) {
+		mi_writer = mi_lttng_writer_create(
+				fileno(stdout), lttng_opt_mi);
+		if (!mi_writer) {
+			ret = CMD_ERROR;
+			goto error;
+		}
+
+		/* Open command element. */
+		ret = mi_lttng_writer_command_open(mi_writer,
+				mi_lttng_element_command_add_trigger);
+		if (ret) {
+			ret = CMD_ERROR;
+			goto error;
+		}
+
+		/* Open output element. */
+		ret = mi_lttng_writer_open_element(
+				mi_writer, mi_lttng_element_command_output);
+		if (ret) {
+			ret = CMD_ERROR;
+			goto error;
+		}
+	}
+
 	while (true) {
 		enum argpar_state_parse_next_status status;
 		const struct argpar_item_opt *item_opt;
@@ -2111,7 +2306,7 @@ int cmd_add_trigger(int argc, const char **argv)
 				goto error;
 			}
 
-			/* Ownership of the action was transferred to the group. */
+			/* Ownership of the action was transferred to the list. */
 			action = NULL;
 
 			break;
@@ -2176,16 +2371,6 @@ int cmd_add_trigger(int argc, const char **argv)
 		goto error;
 	}
 
-	if (name) {
-		enum lttng_trigger_status trigger_status =
-				lttng_trigger_set_name(trigger, name);
-
-		if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
-			ERR("Failed to set trigger name.");
-			goto error;
-		}
-	}
-
 	if (owner_uid) {
 		enum lttng_trigger_status trigger_status;
 		char *end;
@@ -2195,6 +2380,7 @@ int cmd_add_trigger(int argc, const char **argv)
 		uid = strtol(owner_uid, &end, 10);
 		if (end == owner_uid || *end != '\0' || errno != 0) {
 			ERR("Failed to parse `%s` as a user id.", owner_uid);
+			goto error;
 		}
 
 		trigger_status = lttng_trigger_set_owner_uid(trigger, uid);
@@ -2204,13 +2390,37 @@ int cmd_add_trigger(int argc, const char **argv)
 		}
 	}
 
-	ret = lttng_register_trigger(trigger);
-	if (ret) {
-		ERR("Failed to register trigger: %s.", lttng_strerror(ret));
+	if (name) {
+		ret_code = lttng_register_trigger_with_name(trigger, name);
+	} else {
+		ret_code = lttng_register_trigger_with_automatic_name(trigger);
+	}
+
+	if (ret_code != LTTNG_OK) {
+		ERR("Failed to register trigger: %s.",
+				lttng_strerror(-ret_code));
 		goto error;
 	}
 
-	MSG("Trigger registered successfully.");
+	if (lttng_opt_mi) {
+		ret_code = lttng_trigger_mi_serialize(trigger, mi_writer, NULL);
+		if (ret_code != LTTNG_OK) {
+			goto error;
+		}
+	} else {
+		const char *returned_trigger_name;
+		const enum lttng_trigger_status trigger_status =
+				lttng_trigger_get_name(trigger,
+						&returned_trigger_name);
+
+		if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+			WARN("Failed to retrieve the added trigger's name.");
+		} else {
+			MSG("Added trigger `%s`.", returned_trigger_name);
+		}
+	}
+
+	ret = 0;
 
 	goto end;
 
@@ -2218,6 +2428,33 @@ error:
 	ret = 1;
 
 end:
+	/* Mi closing. */
+	if (lttng_opt_mi && mi_writer) {
+		int mi_ret;
+
+		/* Close output element. */
+		mi_ret = mi_lttng_writer_close_element(mi_writer);
+		if (mi_ret) {
+			ret = 1;
+			goto cleanup;
+		}
+
+		mi_ret = mi_lttng_writer_write_element_bool(mi_writer,
+				mi_lttng_element_command_success, ret ? 0 : 1);
+		if (mi_ret) {
+			ret = 1;
+			goto cleanup;
+		}
+
+		/* Command element close. */
+		mi_ret = mi_lttng_writer_command_close(mi_writer);
+		if (mi_ret) {
+			ret = 1;
+			goto cleanup;
+		}
+	}
+
+cleanup:
 	argpar_state_destroy(argpar_state);
 	argpar_item_destroy(argpar_item);
 	lttng_dynamic_pointer_array_reset(&actions);
@@ -2228,5 +2465,10 @@ end:
 	free(error);
 	free(name);
 	free(owner_uid);
+	if (mi_writer && mi_lttng_writer_destroy(mi_writer)) {
+		/* Preserve original error code. */
+		ret = ret ? ret : CMD_ERROR;
+	}
+
 	return ret;
 }