X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=776e24470aabdb78607ad9ffa4fb9fe01c0ea782;hb=26d0e3569499275a072d80c811825045e3291aed;hp=b55f4edde8bd5b6ff2454e88e4ebd8c1fe387db4;hpb=1f1567a534b09badcbe6f6c10a4693e9fddb62dc;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index b55f4edde..776e24470 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -960,11 +960,6 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 		int ret;
 		enum lttng_event_rule_status event_rule_status;
 
-		res.er = lttng_event_rule_kernel_probe_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,16 +967,16 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		event_rule_status = lttng_event_rule_kernel_probe_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_kernel_probe_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;
 		}
 
@@ -999,20 +994,13 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			goto error;
 		}
 
-		res.er = lttng_event_rule_userspace_probe_create();
+		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_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_userspace_probe_set_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'.",
@@ -1096,7 +1084,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 +1100,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) {