X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist_triggers.c;h=b497d4f4d82bcafeeb25d68395ecbb5b8778fc82;hb=702f26c8641ee4554c629d13b9367b1e93f96e31;hp=bb118e56a217f48c70aeb78a309d28f8c84259ea;hpb=19904669a9eb25cd4a0ccd3de82d3ac803dfe877;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c
index bb118e56a..b497d4f4d 100644
--- a/src/bin/lttng/commands/list_triggers.c
+++ b/src/bin/lttng/commands/list_triggers.c
@@ -14,10 +14,12 @@
 #include "common/mi-lttng.h"
 /* For lttng_condition_type_str(). */
 #include "lttng/condition/condition-internal.h"
-#include "lttng/condition/on-event.h"
-#include "lttng/condition/on-event-internal.h"
+#include "lttng/condition/event-rule-matches.h"
+#include "lttng/condition/event-rule-matches-internal.h"
 /* For lttng_domain_type_str(). */
 #include "lttng/domain-internal.h"
+/* For lttng_event_rule_syscall_emission_site_str() */
+#include "lttng/event-rule/syscall-internal.h"
 #include "../loglevel.h"
 #include <lttng/lttng.h>
 
@@ -387,14 +389,20 @@ void print_event_rule_syscall(const struct lttng_event_rule *event_rule)
 {
 	const char *pattern, *filter;
 	enum lttng_event_rule_status event_rule_status;
+	enum lttng_event_rule_syscall_emission_site_type emission_site_type;
 
 	assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_SYSCALL);
 
+	emission_site_type =
+		lttng_event_rule_syscall_get_emission_site_type(event_rule);
+
 	event_rule_status = lttng_event_rule_syscall_get_pattern(
 			event_rule, &pattern);
 	assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
 
-	_MSG("    rule: %s (type: syscall", pattern);
+	_MSG("    rule: %s (type: syscall:%s", pattern,
+			lttng_event_rule_syscall_emission_site_str(
+					emission_site_type));
 
 	event_rule_status = lttng_event_rule_syscall_get_filter(
 			event_rule, &filter);
@@ -498,21 +506,21 @@ void print_one_event_expr(const struct lttng_event_expr *event_expr)
 	}
 }
 
-static
-void print_condition_on_event(const struct lttng_condition *condition)
+static void print_condition_event_rule_matches(
+		const struct lttng_condition *condition)
 {
 	const struct lttng_event_rule *event_rule;
 	enum lttng_condition_status condition_status;
 	unsigned int cap_desc_count, i;
 
-	condition_status =
-		lttng_condition_on_event_get_rule(condition, &event_rule);
+	condition_status = lttng_condition_event_rule_matches_get_rule(
+			condition, &event_rule);
 	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 
 	print_event_rule(event_rule);
 
 	condition_status =
-			lttng_condition_on_event_get_capture_descriptor_count(
+			lttng_condition_event_rule_matches_get_capture_descriptor_count(
 					condition, &cap_desc_count);
 	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 
@@ -521,7 +529,7 @@ void print_condition_on_event(const struct lttng_condition *condition)
 
 		for (i = 0; i < cap_desc_count; i++) {
 			const struct lttng_event_expr *cap_desc =
-					lttng_condition_on_event_get_capture_descriptor_at_index(
+					lttng_condition_event_rule_matches_get_capture_descriptor_at_index(
 							condition, i);
 
 			_MSG("      - ");
@@ -909,8 +917,8 @@ void print_one_trigger(const struct lttng_trigger *trigger)
 	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
 		print_condition_session_rotation(condition);
 		break;
-	case LTTNG_CONDITION_TYPE_ON_EVENT:
-		print_condition_on_event(condition);
+	case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
+		print_condition_event_rule_matches(condition);
 		break;
 	default:
 		abort();
@@ -924,12 +932,12 @@ void print_one_trigger(const struct lttng_trigger *trigger)
 
 		MSG("  actions:");
 
-		action_status = lttng_action_group_get_count(action, &count);
+		action_status = lttng_action_list_get_count(action, &count);
 		assert(action_status == LTTNG_ACTION_STATUS_OK);
 
 		for (i = 0; i < count; i++) {
 			const struct lttng_action *subaction =
-					lttng_action_group_get_at_index(
+					lttng_action_list_get_at_index(
 							action, i);
 
 			_MSG("    ");