X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=092f3c8e2dd3991d03b97ad498a1f5909af3029b;hp=feba92f6fb9c33c2ab0600a6698277c9716b3c6e;hb=405f9e7db1cd7c023614ae249f0705fbb3da514c;hpb=81d566c913e31b5dbd6ec304e679a3b248abec2b

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index feba92f6f..092f3c8e2 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -634,7 +634,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 				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;
 				}
 
@@ -645,7 +645,7 @@ struct parse_event_rule_res 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;
 				}
 
@@ -817,9 +817,9 @@ struct parse_event_rule_res 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_KERNEL_PROBE:
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	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.");
@@ -955,16 +955,11 @@ struct parse_event_rule_res 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;
 
-		res.er = lttng_event_rule_kprobe_create();
-		if (!res.er) {
-			ERR("Failed to create kprobe event rule.");
-			goto error;
-		}
 
 		ret = parse_kernel_probe_opts(source, &kernel_probe_location);
 		if (ret) {
@@ -972,22 +967,22 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		event_rule_status = lttng_event_rule_kprobe_set_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);
+		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;
 		}
 
-		assert(kernel_probe_location);
-		event_rule_status = lttng_event_rule_kprobe_set_location(res.er, kernel_probe_location);
+		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 location.");
+			ERR("Failed to set kprobe 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;
@@ -999,21 +994,22 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		res.er = lttng_event_rule_uprobe_create();
+		res.er = lttng_event_rule_userspace_probe_create();
 		if (!res.er) {
 			ERR("Failed to create userspace probe event rule.");
 			goto error;
 		}
 
-		event_rule_status = lttng_event_rule_uprobe_set_location(
+		event_rule_status = lttng_event_rule_userspace_probe_set_location(
 				res.er, userspace_probe_location);
 		if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ERR("Failed to set user space probe event rule's location.");
 			goto error;
 		}
 
-		event_rule_status = lttng_event_rule_uprobe_set_name(
-				res.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);
@@ -1096,7 +1092,7 @@ struct lttng_condition *handle_condition_event(int *argc, const char ***argv)
 		goto error;
 	}
 
-	c = lttng_condition_event_rule_create(res.er);
+	c = lttng_condition_on_event_create(res.er);
 	lttng_event_rule_destroy(res.er);
 	res.er = NULL;
 	if (!c) {
@@ -1112,7 +1108,7 @@ struct lttng_condition *handle_condition_event(int *argc, const char ***argv)
 
 		assert(expr);
 		assert(*expr);
-		status = lttng_condition_event_rule_append_capture_descriptor(
+		status = lttng_condition_on_event_append_capture_descriptor(
 				c, *expr);
 		if (status != LTTNG_CONDITION_STATUS_OK) {
 			if (status == LTTNG_CONDITION_STATUS_UNSUPPORTED) {