X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist_triggers.c;h=9c2cf0909ed61bf06d093578d57d1e44cde0e23c;hb=85522de5747fee084e2e391678a79918355345da;hp=10f76e843986fd99c1bb1e50073eedb5cea2d7bf;hpb=4f7da553ae57a6c947da2b9668c06418b2d50e99;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c
index 10f76e843..9c2cf0909 100644
--- a/src/bin/lttng/commands/list_triggers.c
+++ b/src/bin/lttng/commands/list_triggers.c
@@ -294,22 +294,22 @@ void print_event_rule_kernel_probe(const struct lttng_event_rule *event_rule)
 	const char *name;
 	const struct lttng_kernel_probe_location *location;
 
-	assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE);
+	assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE);
 
-	event_rule_status = lttng_event_rule_kernel_probe_get_event_name(event_rule, &name);
+	event_rule_status = lttng_event_rule_kernel_kprobe_get_event_name(event_rule, &name);
 	if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 		ERR("Failed to get kprobe event rule's name.");
 		goto end;
 	}
 
-	event_rule_status = lttng_event_rule_kernel_probe_get_location(
+	event_rule_status = lttng_event_rule_kernel_kprobe_get_location(
 			event_rule, &location);
 	if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 		ERR("Failed to get kprobe event rule's location.");
 		goto end;
 	}
 
-	_MSG("    rule: %s (type: probe, location: ", name);
+	_MSG("    rule: %s (type: kernel:kprobe, location: ", name);
 
 	print_kernel_probe_location(location);
 
@@ -327,23 +327,23 @@ void print_event_rule_userspace_probe(const struct lttng_event_rule *event_rule)
 	const struct lttng_userspace_probe_location *location;
 	enum lttng_userspace_probe_location_type userspace_probe_location_type;
 
-	assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE);
+	assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE);
 
-	event_rule_status = lttng_event_rule_userspace_probe_get_event_name(
+	event_rule_status = lttng_event_rule_kernel_uprobe_get_event_name(
 			event_rule, &name);
 	if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 		ERR("Failed to get uprobe event rule's name.");
 		goto end;
 	}
 
-	event_rule_status = lttng_event_rule_userspace_probe_get_location(
+	event_rule_status = lttng_event_rule_kernel_uprobe_get_location(
 			event_rule, &location);
 	if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
 		ERR("Failed to get uprobe event rule's location.");
 		goto end;
 	}
 
-	_MSG("    rule: %s (type: userspace probe, ", name);
+	_MSG("    rule: %s (type: kernel:uprobe, ", name);
 
 	userspace_probe_location_type =
 			lttng_userspace_probe_location_get_type(location);
@@ -425,10 +425,10 @@ void print_event_rule(const struct lttng_event_rule *event_rule)
 	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
 		print_event_rule_tracepoint(event_rule);
 		break;
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 		print_event_rule_kernel_probe(event_rule);
 		break;
-	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 		print_event_rule_userspace_probe(event_rule);
 		break;
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: