X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=f42720df681d3e04def2629152412ab6bfb48cec;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hp=0c714d84962bcaf0d9a1b697bba27de0fefa1dc4;hpb=b78ef509112ca7621b75777e9f90c1e42233f278;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 0c714d849..f42720df6 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -19,6 +19,18 @@
 /* For lttng_event_rule_type_str(). */
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/lttng.h>
+#include "lttng/event-rule/kernel-function.h"
+#include "lttng/event-rule/kernel-probe.h"
+#include "lttng/event-rule/syscall.h"
+#include <lttng/event-rule/tracepoint.h>
+#include "lttng/event-rule/userspace-probe.h"
+#include "lttng/kernel-function.h"
+#include "lttng/kernel-probe.h"
+#include "lttng/log-level-rule.h"
+#include "lttng/map-key-internal.h"
+#include "common/filter/filter-ast.h"
+#include "common/filter/filter-ir.h"
+#include "common/dynamic-array.h"
 
 #if (LTTNG_SYMBOL_NAME_LEN == 256)
 #define LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API "255"
@@ -65,6 +77,12 @@ enum {
 	OPT_CTRL_URL,
 	OPT_URL,
 	OPT_PATH,
+
+	OPT_SESSION_NAME,
+	OPT_MAP_NAME,
+	OPT_KEY,
+
+	OPT_CAPTURE,
 };
 
 static const struct argpar_opt_descr event_rule_opt_descrs[] = {
@@ -88,6 +106,9 @@ static const struct argpar_opt_descr event_rule_opt_descrs[] = {
 	{ OPT_SYSCALL, '\0', "syscall" },
 	{ OPT_TRACEPOINT, '\0', "tracepoint" },
 
+	/* Capture descriptor */
+	{ OPT_CAPTURE, '\0', "capture", true },
+
 	ARGPAR_OPT_DESCR_SENTINEL
 };
 
@@ -229,7 +250,7 @@ static int parse_kernel_probe_opts(const char *source,
 
 		*location = lttng_kernel_probe_location_symbol_create(
 				symbol_name, offset);
-		if (!location) {
+		if (!*location) {
 			ERR("Failed to create symbol kernel probe location.");
 			goto error;
 		}
@@ -273,7 +294,7 @@ static int parse_kernel_probe_opts(const char *source,
 
 		address = strtoul(s_hex, NULL, 0);
 		*location = lttng_kernel_probe_location_address_create(address);
-		if (!location) {
+		if (!*location) {
 			ERR("Failed to create symbol kernel probe location.");
 			goto error;
 		}
@@ -291,9 +312,328 @@ end:
 	return ret;
 }
 
-static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
+static int parse_kernel_function_opts(const char *source,
+		struct lttng_kernel_function_location **location)
+{
+	int ret = 0;
+	int match;
+	char s_hex[19];
+	char name[LTTNG_SYMBOL_NAME_LEN];
+	char *symbol_name = NULL;
+	uint64_t offset;
+
+	/* Check for symbol+offset. */
+	match = sscanf(source,
+			"%" LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API
+			"[^'+']+%18s",
+			name, s_hex);
+	if (match == 2) {
+		if (*s_hex == '\0') {
+			ERR("Kernel function symbol offset is missing.");
+			goto error;
+		}
+
+		symbol_name = strndup(name, LTTNG_SYMBOL_NAME_LEN);
+		if (!symbol_name) {
+			PERROR("Failed to copy kernel function location symbol name.");
+			goto error;
+		}
+		offset = strtoul(s_hex, NULL, 0);
+
+		*location = lttng_kernel_function_location_symbol_create(
+				symbol_name, offset);
+		if (!*location) {
+			ERR("Failed to create symbol kernel function location.");
+			goto error;
+		}
+
+		goto end;
+	}
+
+	/* Check for symbol. */
+	if (isalpha(name[0]) || name[0] == '_') {
+		match = sscanf(source,
+				"%" LTTNG_SYMBOL_NAME_LEN_SCANF_IS_A_BROKEN_API
+				"s",
+				name);
+		if (match == 1) {
+			symbol_name = strndup(name, LTTNG_SYMBOL_NAME_LEN);
+			if (!symbol_name) {
+				ERR("Failed to copy kernel function location symbol name.");
+				goto error;
+			}
+
+			*location = lttng_kernel_function_location_symbol_create(
+					symbol_name, 0);
+			if (!*location) {
+				ERR("Failed to create symbol kernel function location.");
+				goto error;
+			}
+
+			goto end;
+		}
+	}
+
+	/* Check for address. */
+	match = sscanf(source, "%18s", s_hex);
+	if (match > 0) {
+		uint64_t address;
+
+		if (*s_hex == '\0') {
+			ERR("Invalid kernel function location address.");
+			goto error;
+		}
+
+		address = strtoul(s_hex, NULL, 0);
+		*location = lttng_kernel_function_location_address_create(address);
+		if (!*location) {
+			ERR("Failed to create symbol kernel function location.");
+			goto error;
+		}
+
+		goto end;
+	}
+
+error:
+	/* No match */
+	ret = -1;
+	*location = NULL;
+
+end:
+	free(symbol_name);
+	return ret;
+}
+
+static
+struct lttng_event_expr *ir_op_load_expr_to_event_expr(
+		const struct ir_load_expression *load_expr,
+		const char *capture_str)
+{
+	char *provider_name = NULL;
+	struct lttng_event_expr *event_expr = NULL;
+	const struct ir_load_expression_op *load_expr_op = load_expr->child;
+	const enum ir_load_expression_type load_expr_child_type =
+			load_expr_op->type;
+
+	switch (load_expr_child_type) {
+	case IR_LOAD_EXPRESSION_GET_PAYLOAD_ROOT:
+	case IR_LOAD_EXPRESSION_GET_CONTEXT_ROOT:
+	{
+		const char *field_name;
+
+		load_expr_op = load_expr_op->next;
+		assert(load_expr_op);
+		assert(load_expr_op->type == IR_LOAD_EXPRESSION_GET_SYMBOL);
+		field_name = load_expr_op->u.symbol;
+		assert(field_name);
+
+		event_expr = load_expr_child_type == IR_LOAD_EXPRESSION_GET_PAYLOAD_ROOT ?
+				lttng_event_expr_event_payload_field_create(field_name) :
+				lttng_event_expr_channel_context_field_create(field_name);
+		if (!event_expr) {
+			ERR("Failed to create %s event expression: field name = `%s`.",
+					load_expr_child_type == IR_LOAD_EXPRESSION_GET_PAYLOAD_ROOT ?
+							"payload field" : "channel context",
+							field_name);
+			goto error;
+		}
+
+		break;
+	}
+	case IR_LOAD_EXPRESSION_GET_APP_CONTEXT_ROOT:
+	{
+		const char *colon;
+		const char *type_name;
+		const char *field_name;
+
+		load_expr_op = load_expr_op->next;
+		assert(load_expr_op);
+		assert(load_expr_op->type == IR_LOAD_EXPRESSION_GET_SYMBOL);
+		field_name = load_expr_op->u.symbol;
+		assert(field_name);
+
+		/*
+		 * The field name needs to be of the form PROVIDER:TYPE. We
+		 * split it here.
+		 */
+		colon = strchr(field_name, ':');
+		if (!colon) {
+			ERR("Invalid app-specific context field name: missing colon in `%s`.",
+					field_name);
+			goto error;
+		}
+
+		type_name = colon + 1;
+		if (*type_name == '\0') {
+			ERR("Invalid app-specific context field name: missing type name after colon in `%s`.",
+					field_name);
+			goto error;
+		}
+
+		provider_name = strndup(field_name, colon - field_name);
+		if (!provider_name) {
+			PERROR("Failed to allocate field name string");
+			goto error;
+		}
+
+		event_expr = lttng_event_expr_app_specific_context_field_create(
+				provider_name, type_name);
+		if (!event_expr) {
+			ERR("Failed to create app-specific context field event expression: provider name = `%s`, type name = `%s`",
+					provider_name, type_name);
+			goto error;
+		}
+
+		break;
+	}
+	default:
+		ERR("%s: unexpected load expr type %d.", __func__,
+				load_expr_op->type);
+		abort();
+	}
+
+	load_expr_op = load_expr_op->next;
+
+	/* There may be a single array index after that. */
+	if (load_expr_op->type == IR_LOAD_EXPRESSION_GET_INDEX) {
+		struct lttng_event_expr *index_event_expr;
+		const uint64_t index = load_expr_op->u.index;
+
+		index_event_expr = lttng_event_expr_array_field_element_create(event_expr, index);
+		if (!index_event_expr) {
+			ERR("Failed to create array field element event expression.");
+			goto error;
+		}
+
+		event_expr = index_event_expr;
+		load_expr_op = load_expr_op->next;
+	}
+
+	switch (load_expr_op->type) {
+	case IR_LOAD_EXPRESSION_LOAD_FIELD:
+		/*
+		 * This is what we expect, IR_LOAD_EXPRESSION_LOAD_FIELD is
+		 * always found at the end of the chain.
+		 */
+		break;
+	case IR_LOAD_EXPRESSION_GET_SYMBOL:
+		ERR("While parsing expression `%s`: Capturing subfields is not supported.",
+				capture_str);
+		goto error;
+
+	default:
+		ERR("%s: unexpected load expression operator %s.", __func__,
+				ir_load_expression_type_str(load_expr_op->type));
+		abort();
+	}
+
+	goto end;
+
+error:
+	lttng_event_expr_destroy(event_expr);
+	event_expr = NULL;
+
+end:
+	free(provider_name);
+
+	return event_expr;
+}
+
+static
+struct lttng_event_expr *ir_op_load_to_event_expr(
+		const struct ir_op *ir, const char *capture_str)
+{
+	struct lttng_event_expr *event_expr = NULL;
+
+	assert(ir->op == IR_OP_LOAD);
+
+	switch (ir->data_type) {
+	case IR_DATA_EXPRESSION:
+	{
+		const struct ir_load_expression *ir_load_expr =
+				ir->u.load.u.expression;
+
+		event_expr = ir_op_load_expr_to_event_expr(
+				ir_load_expr, capture_str);
+		break;
+	}
+	default:
+		ERR("%s: unexpected data type: %s.", __func__,
+				ir_data_type_str(ir->data_type));
+		abort();
+	}
+
+	return event_expr;
+}
+
+static
+const char *ir_operator_type_human_str(enum ir_op_type op)
+{
+	const char *name;
+
+	switch (op) {
+	case IR_OP_BINARY:
+		name = "Binary";
+		break;
+	case IR_OP_UNARY:
+		name = "Unary";
+		break;
+	case IR_OP_LOGICAL:
+		name = "Logical";
+		break;
+	default:
+		abort();
+	}
+
+	return name;
+}
+
+static
+struct lttng_event_expr *ir_op_root_to_event_expr(const struct ir_op *ir,
+		const char *capture_str)
+{
+	struct lttng_event_expr *event_expr = NULL;
+
+	assert(ir->op == IR_OP_ROOT);
+	ir = ir->u.root.child;
+
+	switch (ir->op) {
+	case IR_OP_LOAD:
+		event_expr = ir_op_load_to_event_expr(ir, capture_str);
+		break;
+	case IR_OP_BINARY:
+	case IR_OP_UNARY:
+	case IR_OP_LOGICAL:
+		ERR("While parsing expression `%s`: %s operators are not allowed in capture expressions.",
+				capture_str,
+				ir_operator_type_human_str(ir->op));
+		break;
+	default:
+		ERR("%s: unexpected IR op type: %s.", __func__,
+				ir_op_type_str(ir->op));
+		abort();
+	}
+
+	return event_expr;
+}
+
+static
+void destroy_event_expr(void *ptr)
+{
+	lttng_event_expr_destroy(ptr);
+}
+
+struct parse_event_rule_res {
+	/* Owned by this. */
+	struct lttng_event_rule *er;
+
+	/* Array of `struct lttng_event_expr *` */
+	struct lttng_dynamic_pointer_array capture_descriptors;
+};
+
+static
+struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 {
-	struct lttng_event_rule *er = NULL;
 	enum lttng_domain_type domain_type = LTTNG_DOMAIN_NONE;
 	enum lttng_event_rule_type event_rule_type =
 			LTTNG_EVENT_RULE_TYPE_UNKNOWN;
@@ -302,7 +642,12 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 	char *error = NULL;
 	int consumed_args = -1;
 	struct lttng_kernel_probe_location *kernel_probe_location = NULL;
+	struct lttng_kernel_function_location *kernel_function_location = NULL;
 	struct lttng_userspace_probe_location *userspace_probe_location = NULL;
+	struct parse_event_rule_res res = { 0 };
+	struct lttng_event_expr *event_expr = NULL;
+	struct filter_parser_ctx *parser_ctx = NULL;
+	struct lttng_log_level_rule *log_level_rule = NULL;
 
 	/* Was the -a/--all flag provided? */
 	bool all_events = false;
@@ -324,6 +669,8 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 	char *loglevel_str = NULL;
 	bool loglevel_only = false;
 
+	lttng_dynamic_pointer_array_init(&res.capture_descriptors,
+				destroy_event_expr);
 	state = argpar_state_create(*argc, *argv, event_rule_opt_descrs);
 	if (!state) {
 		ERR("Failed to allocate an argpar state.");
@@ -387,14 +734,18 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 			/* Event rule types */
 			case OPT_FUNCTION:
 				if (!assign_event_rule_type(&event_rule_type,
-						LTTNG_EVENT_RULE_TYPE_KRETPROBE)) {
+						LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION)) {
+					goto error;
+				}
+
+				if (!assign_string(&source, item_opt->arg, "source")) {
 					goto error;
 				}
 
 				break;
 			case OPT_PROBE:
 				if (!assign_event_rule_type(&event_rule_type,
-						LTTNG_EVENT_RULE_TYPE_KPROBE)) {
+						LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE)) {
 					goto error;
 				}
 
@@ -405,7 +756,7 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 				break;
 			case OPT_USERSPACE_PROBE:
 				if (!assign_event_rule_type(&event_rule_type,
-						LTTNG_EVENT_RULE_TYPE_UPROBE)) {
+						LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE)) {
 					goto error;
 				}
 
@@ -455,6 +806,45 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 				loglevel_only = item_opt->descr->id ==
 						OPT_LOGLEVEL_ONLY;
 				break;
+			case OPT_CAPTURE:
+			{
+				int ret;
+				const char *capture_str = item_opt->arg;
+
+				ret = filter_parser_ctx_create_from_filter_expression(
+						capture_str, &parser_ctx);
+				if (ret) {
+					ERR("Failed to parse capture expression `%s`.",
+							capture_str);
+					goto error;
+				}
+
+				event_expr = ir_op_root_to_event_expr(
+						parser_ctx->ir_root,
+						capture_str);
+				if (!event_expr) {
+					/*
+					 * ir_op_root_to_event_expr has printed
+					 * an error message.
+					 */
+					goto error;
+				}
+
+				ret = lttng_dynamic_pointer_array_add_pointer(
+						&res.capture_descriptors,
+						event_expr);
+				if (ret) {
+					goto error;
+				}
+
+				/*
+				 * The ownership of event expression was
+				 * transferred to the dynamic array.
+				 */
+				event_expr = NULL;
+
+				break;
+			}
 			default:
 				abort();
 			}
@@ -538,9 +928,9 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 
 	/* Validate event rule type against domain. */
 	switch (event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	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.");
@@ -599,15 +989,15 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 	{
 		enum lttng_event_rule_status event_rule_status;
 
-		er = lttng_event_rule_tracepoint_create(domain_type);
-		if (!er) {
+		res.er = lttng_event_rule_tracepoint_create(domain_type);
+		if (!res.er) {
 			ERR("Failed to create tracepoint event rule.");
 			goto error;
 		}
 
 		/* Set pattern. */
 		event_rule_status = lttng_event_rule_tracepoint_set_pattern(
-				er, tracepoint_name);
+				res.er, tracepoint_name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set tracepoint event rule's pattern to '%s'.",
 					tracepoint_name);
@@ -617,7 +1007,7 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 		/* Set filter. */
 		if (filter) {
 			event_rule_status = lttng_event_rule_tracepoint_set_filter(
-					er, filter);
+					res.er, filter);
 			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 				ERR("Failed to set tracepoint event rule's filter to '%s'.",
 						filter);
@@ -631,7 +1021,7 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 
 			for (n = 0; exclusion_list[n]; n++) {
 				event_rule_status = lttng_event_rule_tracepoint_add_exclusion(
-						er,
+						res.er,
 						exclusion_list[n]);
 				if (event_rule_status !=
 						LTTNG_EVENT_RULE_STATUS_OK) {
@@ -659,13 +1049,20 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 			}
 
 			if (loglevel_only) {
-				event_rule_status = lttng_event_rule_tracepoint_set_log_level(
-						er, loglevel);
+				log_level_rule = lttng_log_level_rule_exactly_create(loglevel);
 			} else {
-				event_rule_status = lttng_event_rule_tracepoint_set_log_level_range_lower_bound(
-						er, loglevel);
+				log_level_rule = lttng_log_level_rule_at_least_as_severe_as_create(loglevel);
+			}
+
+			if (log_level_rule == NULL) {
+				ERR("Failed to create log level rule object.");
+				goto error;
 			}
 
+			event_rule_status =
+				lttng_event_rule_tracepoint_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;
@@ -674,16 +1071,11 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
 	{
 		int ret;
 		enum lttng_event_rule_status event_rule_status;
 
-		er = lttng_event_rule_kprobe_create();
-		if (!er) {
-			ERR("Failed to create kprobe event rule.");
-			goto error;
-		}
 
 		ret = parse_kernel_probe_opts(source, &kernel_probe_location);
 		if (ret) {
@@ -691,22 +1083,49 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		event_rule_status = lttng_event_rule_kprobe_set_name(er, tracepoint_name);
+		assert(kernel_probe_location);
+		res.er = lttng_event_rule_kernel_probe_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(res.er, tracepoint_name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set kprobe event rule's name to '%s'.", tracepoint_name);
 			goto error;
 		}
 
-		assert(kernel_probe_location);
-		event_rule_status = lttng_event_rule_kprobe_set_location(er, kernel_probe_location);
+		break;
+	}
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
+	{
+		int ret;
+		enum lttng_event_rule_status event_rule_status;
+
+
+		ret = parse_kernel_function_opts(source, &kernel_function_location);
+		if (ret) {
+			ERR("Failed to parse kernel function location.");
+			goto error;
+		}
+
+		assert(kernel_function_location);
+		res.er = lttng_event_rule_kernel_function_create(kernel_function_location);
+		if (!res.er) {
+			ERR("Failed to create kfunction event rule.");
+			goto error;
+		}
+
+		event_rule_status = lttng_event_rule_kernel_function_set_event_name(res.er, tracepoint_name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
-			ERR("Failed to set kprobe event rule's location.");
+			ERR("Failed to set kfunction event rule's name to '%s'.", tracepoint_name);
 			goto error;
 		}
 
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
 	{
 		int ret;
 		enum lttng_event_rule_status event_rule_status;
@@ -718,21 +1137,14 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		er = lttng_event_rule_uprobe_create();
-		if (!er) {
-			ERR("Failed to create user space probe event rule.");
-			goto error;
-		}
-
-		event_rule_status = lttng_event_rule_uprobe_set_location(
-				er, userspace_probe_location);
-		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
-			ERR("Failed to set user space probe event rule's location.");
+		res.er = lttng_event_rule_userspace_probe_create(userspace_probe_location);
+		if (!res.er) {
+			ERR("Failed to create userspace probe event rule.");
 			goto error;
 		}
 
-		event_rule_status = lttng_event_rule_uprobe_set_name(
-				er, tracepoint_name);
+		event_rule_status = lttng_event_rule_userspace_probe_set_event_name(
+				res.er, tracepoint_name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set user space probe event rule's name to '%s'.",
 					tracepoint_name);
@@ -745,14 +1157,14 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 	{
 		enum lttng_event_rule_status event_rule_status;
 
-		er = lttng_event_rule_syscall_create();
-		if (!er) {
+		res.er = lttng_event_rule_syscall_create();
+		if (!res.er) {
 			ERR("Failed to create syscall event rule.");
 			goto error;
 		}
 
 		event_rule_status = lttng_event_rule_syscall_set_pattern(
-				er, tracepoint_name);
+				res.er, tracepoint_name);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set syscall event rule's pattern to '%s'.",
 					tracepoint_name);
@@ -761,7 +1173,7 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 
 		if (filter) {
 			event_rule_status = lttng_event_rule_syscall_set_filter(
-					er, filter);
+					res.er, filter);
 			if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 				ERR("Failed to set syscall event rule's filter to '%s'.",
 						filter);
@@ -779,10 +1191,16 @@ static struct lttng_event_rule *parse_event_rule(int *argc, const char ***argv)
 	goto end;
 
 error:
-	lttng_event_rule_destroy(er);
-	er = NULL;
+	lttng_event_rule_destroy(res.er);
+	res.er = NULL;
+	lttng_dynamic_pointer_array_reset(&res.capture_descriptors);
 
 end:
+	if (parser_ctx) {
+		filter_parser_ctx_free(parser_ctx);
+	}
+
+	lttng_event_expr_destroy(event_expr);
 	argpar_item_destroy(item);
 	free(error);
 	argpar_state_destroy(state);
@@ -793,28 +1211,61 @@ end:
 	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);
-	return er;
+	lttng_log_level_rule_destroy(log_level_rule);
+	return res;
 }
 
 static
 struct lttng_condition *handle_condition_event(int *argc, const char ***argv)
 {
-	struct lttng_event_rule *er;
+	struct parse_event_rule_res res;
 	struct lttng_condition *c;
+	size_t i;
 
-	er = parse_event_rule(argc, argv);
-	if (!er) {
+	res = parse_event_rule(argc, argv);
+	if (!res.er) {
 		c = NULL;
-		goto end;
+		goto error;
 	}
 
-	c = lttng_condition_event_rule_create(er);
-	lttng_event_rule_destroy(er);
+	c = lttng_condition_on_event_create(res.er);
+	lttng_event_rule_destroy(res.er);
+	res.er = NULL;
 	if (!c) {
-		goto end;
+		goto error;
 	}
 
+	for (i = 0; i < lttng_dynamic_pointer_array_get_count(&res.capture_descriptors);
+			i++) {
+		enum lttng_condition_status status;
+		struct lttng_event_expr **expr =
+				lttng_dynamic_array_get_element(
+					&res.capture_descriptors.array, i);
+
+		assert(expr);
+		assert(*expr);
+		status = lttng_condition_on_event_append_capture_descriptor(
+				c, *expr);
+		if (status != LTTNG_CONDITION_STATUS_OK) {
+			if (status == LTTNG_CONDITION_STATUS_UNSUPPORTED) {
+				ERR("The capture feature is unsupported by the event-rule type");
+			}
+			goto error;
+		}
+
+		/* Ownership of event expression moved to `c` */
+		*expr = NULL;
+	}
+
+	goto end;
+
+error:
+	lttng_condition_destroy(c);
+	c = NULL;
+
 end:
+	lttng_dynamic_pointer_array_reset(&res.capture_descriptors);
+	lttng_event_rule_destroy(res.er);
 	return c;
 }
 
@@ -1448,6 +1899,139 @@ end:
 	return action;
 }
 
+static const struct argpar_opt_descr incr_value_action_opt_descrs[] = {
+	{ OPT_SESSION_NAME, 's', "session", true },
+	{ OPT_MAP_NAME, 'm', "map", true },
+	{ OPT_KEY, '\0', "key", true },
+	ARGPAR_OPT_DESCR_SENTINEL
+};
+
+static
+struct lttng_action *handle_action_incr_value(int *argc,
+		const char ***argv)
+{
+	struct lttng_action *action = NULL;
+	struct argpar_state *state = NULL;
+	struct argpar_item *item = NULL;
+	struct lttng_map_key *key = NULL;
+	char *session_name_arg = NULL, *map_name_arg = NULL;
+	char *key_arg = NULL;
+	char *error = NULL;
+	enum lttng_action_status action_status;
+
+	state = argpar_state_create(*argc, *argv, incr_value_action_opt_descrs);
+	if (!state) {
+		ERR("Failed to allocate an argpar state.");
+		goto error;
+	}
+
+	while (true) {
+		enum argpar_state_parse_next_status status;
+
+		ARGPAR_ITEM_DESTROY_AND_RESET(item);
+		status = argpar_state_parse_next(state, &item, &error);
+		if (status == ARGPAR_STATE_PARSE_NEXT_STATUS_ERROR) {
+			ERR("%s", error);
+			goto error;
+		} else if (status == ARGPAR_STATE_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT) {
+			/* Just stop parsing here. */
+			break;
+		} else if (status == ARGPAR_STATE_PARSE_NEXT_STATUS_END) {
+			break;
+		}
+
+		assert(status == ARGPAR_STATE_PARSE_NEXT_STATUS_OK);
+
+		if (item->type == ARGPAR_ITEM_TYPE_OPT) {
+			struct argpar_item_opt *item_opt =
+				(struct argpar_item_opt *) item;
+
+			switch (item_opt->descr->id) {
+			case OPT_SESSION_NAME:
+				if (!assign_string(&session_name_arg, item_opt->arg, "--session/-s")) {
+					goto error;
+				}
+				break;
+			case OPT_MAP_NAME:
+				if (!assign_string(&map_name_arg, item_opt->arg, "--map/-m")) {
+					goto error;
+				}
+				break;
+			case OPT_KEY:
+				if (!assign_string(&key_arg, item_opt->arg, "--key")) {
+					goto error;
+				}
+				break;
+			default:
+				abort();
+			}
+		}
+	}
+
+	*argc -= argpar_state_get_ingested_orig_args(state);
+	*argv += argpar_state_get_ingested_orig_args(state);
+
+	if (!session_name_arg) {
+		ERR("Missing session name.");
+		goto error;
+	}
+
+	if (!map_name_arg) {
+		ERR("Missing map name.");
+		goto error;
+	}
+
+	if (!key_arg) {
+		ERR("Missing key");
+		goto error;
+	}
+
+	key = lttng_map_key_parse_from_string(key_arg);
+	if (!key) {
+		ERR("Error parsing key argument");
+		goto error;
+	}
+
+	action = lttng_action_incr_value_create();
+	if (!action) {
+		ERR("Failed to allocate incr-value action.");
+		goto error;
+	}
+
+	action_status = lttng_action_incr_value_set_session_name(action,
+			session_name_arg);
+	if (action_status != LTTNG_ACTION_STATUS_OK) {
+		ERR("Failed to set action incr-value's session name.");
+		goto error;
+	}
+
+	action_status = lttng_action_incr_value_set_map_name(action,
+			map_name_arg);
+	if (action_status != LTTNG_ACTION_STATUS_OK) {
+		ERR("Failed to set action incr-value's map name.");
+		goto error;
+	}
+
+	action_status = lttng_action_incr_value_set_key(action, key);
+	if (action_status != LTTNG_ACTION_STATUS_OK) {
+		ERR("Failed to set action incr-value's key");
+		goto error;
+	}
+
+	goto end;
+
+error:
+	lttng_action_destroy(action);
+	action = NULL;
+
+end:
+	lttng_map_key_destroy(key);
+	free(session_name_arg);
+	free(map_name_arg);
+	free(key_arg);
+	return action;
+}
+
 struct action_descr {
 	const char *name;
 	struct lttng_action *(*handler) (int *argc, const char ***argv);
@@ -1460,6 +2044,7 @@ struct action_descr action_descrs[] = {
 	{ "stop-session", handle_action_stop_session },
 	{ "rotate-session", handle_action_rotate_session },
 	{ "snapshot-session", handle_action_snapshot_session },
+	{ "incr-value", handle_action_incr_value },
 };
 
 static
@@ -1518,6 +2103,30 @@ struct argpar_opt_descr add_trigger_options[] = {
 	ARGPAR_OPT_DESCR_SENTINEL,
 };
 
+static
+bool action_is_tracer_executed(const struct lttng_action *action)
+{
+	bool is_tracer_executed;
+	switch (lttng_action_get_type(action)) {
+	case LTTNG_ACTION_TYPE_NOTIFY:
+	case LTTNG_ACTION_TYPE_START_SESSION:
+	case LTTNG_ACTION_TYPE_STOP_SESSION:
+	case LTTNG_ACTION_TYPE_ROTATE_SESSION:
+	case LTTNG_ACTION_TYPE_SNAPSHOT_SESSION:
+		is_tracer_executed = false;
+		goto end;
+	case LTTNG_ACTION_TYPE_INCREMENT_VALUE:
+		is_tracer_executed = true;
+		goto end;
+	case LTTNG_ACTION_TYPE_GROUP:
+	default:
+		abort();
+	}
+
+end:
+	return is_tracer_executed;
+}
+
 static
 void lttng_actions_destructor(void *p)
 {
@@ -1705,6 +2314,18 @@ int cmd_add_trigger(int argc, const char **argv)
 		enum lttng_action_status status;
 
 		action = lttng_dynamic_pointer_array_steal_pointer(&actions, i);
+		if (action_is_tracer_executed(action)) {
+			if (fire_every_str || fire_once_after_str) {
+				/*
+				 * Firing policy with tracer-executed actions
+				 * (`incr-value`) is not supported at the
+				 * moment. It's not clear how the tracers will
+				 * handle the different policies efficiently.
+				 */
+				ERR("Can't use --fire-once-after or --fire-every with tracer executed action (incr-value)");
+				goto error;
+			}
+		}
 
 		status = lttng_action_group_add_action(action_group, action);
 		if (status != LTTNG_ACTION_STATUS_OK) {