X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist_triggers.c;h=6f5828ff17b5413eb9f24238b980a0fddc5c87c3;hb=b2eeb0d5db1245d03f5bfc300a42ee3e9615237f;hp=bb90e7b6e196f44d822b52d808b792d64c2b9006;hpb=0efb2ad7fc448283184e43d6fb0915febae45384;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c
index bb90e7b6e..6f5828ff1 100644
--- a/src/bin/lttng/commands/list_triggers.c
+++ b/src/bin/lttng/commands/list_triggers.c
@@ -159,7 +159,7 @@ void print_event_rule_tracepoint(const struct lttng_event_rule *event_rule)
 	unsigned int exclusions_count;
 	int i;
 
-	event_rule_status = lttng_event_rule_tracepoint_get_pattern(
+	event_rule_status = lttng_event_rule_tracepoint_get_name_pattern(
 			event_rule, &pattern);
 	assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
 
@@ -214,7 +214,7 @@ void print_event_rule_tracepoint(const struct lttng_event_rule *event_rule)
 		assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_UNSET);
 	}
 
-	event_rule_status = lttng_event_rule_tracepoint_get_exclusions_count(
+	event_rule_status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_count(
 			event_rule, &exclusions_count);
 	assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
 	if (exclusions_count > 0) {
@@ -222,7 +222,7 @@ void print_event_rule_tracepoint(const struct lttng_event_rule *event_rule)
 		for (i = 0; i < exclusions_count; i++) {
 			const char *exclusion;
 
-			event_rule_status = lttng_event_rule_tracepoint_get_exclusion_at_index(
+			event_rule_status = lttng_event_rule_tracepoint_get_name_pattern_exclusion_at_index(
 					event_rule, i, &exclusion);
 			assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
 
@@ -396,7 +396,7 @@ void print_event_rule_syscall(const struct lttng_event_rule *event_rule)
 	emission_site_type =
 		lttng_event_rule_syscall_get_emission_site_type(event_rule);
 
-	event_rule_status = lttng_event_rule_syscall_get_pattern(
+	event_rule_status = lttng_event_rule_syscall_get_name_pattern(
 			event_rule, &pattern);
 	assert(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
 
@@ -539,9 +539,10 @@ static void print_condition_event_rule_matches(
 	}
 }
 
-static
-void print_action_errors(const struct lttng_trigger *trigger,
-		const struct lttng_action *action)
+static void print_action_errors(const struct lttng_trigger *trigger,
+		const struct lttng_action *action,
+		const uint64_t *action_path_indexes,
+		size_t action_path_length)
 {
 	unsigned int i, count, printed_errors_count = 0;
 	enum lttng_error_code error_query_ret;
@@ -550,9 +551,13 @@ void print_action_errors(const struct lttng_trigger *trigger,
 	const char *trigger_name;
 	uid_t trigger_uid;
 	enum lttng_trigger_status trigger_status;
-	struct lttng_error_query *query =
-			lttng_error_query_action_create(trigger, action);
+	struct lttng_error_query *query;
+	struct lttng_action_path *action_path = lttng_action_path_create(
+			action_path_indexes, action_path_length);
+
+	assert(action_path);
 
+	query = lttng_error_query_action_create(trigger, action_path);
 	assert(query);
 
 	trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
@@ -625,11 +630,14 @@ end:
 	MSG("");
 	lttng_error_query_destroy(query);
 	lttng_error_query_results_destroy(results);
+	lttng_action_path_destroy(action_path);
 }
 
 static
 void print_one_action(const struct lttng_trigger *trigger,
-		const struct lttng_action *action)
+		const struct lttng_action *action,
+		const uint64_t *action_path_indexes,
+		size_t action_path_length)
 {
 	enum lttng_action_type action_type;
 	enum lttng_action_status action_status;
@@ -637,7 +645,7 @@ void print_one_action(const struct lttng_trigger *trigger,
 	const char *value;
 
 	action_type = lttng_action_get_type(action);
-	assert(action_type != LTTNG_ACTION_TYPE_GROUP);
+	assert(action_type != LTTNG_ACTION_TYPE_LIST);
 
 	switch (action_type) {
 	case LTTNG_ACTION_TYPE_NOTIFY:
@@ -773,7 +781,7 @@ void print_one_action(const struct lttng_trigger *trigger,
 				/* The default is 1 so print only when it is a
 				 * special case.
 				 */
-				_MSG(", rate policy: after every %" PRIu64
+				_MSG(", rate policy: every %" PRIu64
 				     " occurrences",
 						policy_value);
 			}
@@ -795,7 +803,8 @@ void print_one_action(const struct lttng_trigger *trigger,
 	}
 
 	MSG("");
-	print_action_errors(trigger, action);
+	print_action_errors(trigger, action, action_path_indexes,
+			action_path_length);
 
 end:
 	return;
@@ -939,7 +948,7 @@ void print_one_trigger(const struct lttng_trigger *trigger)
 
 	action = lttng_trigger_get_const_action(trigger);
 	action_type = lttng_action_get_type(action);
-	if (action_type == LTTNG_ACTION_TYPE_GROUP) {
+	if (action_type == LTTNG_ACTION_TYPE_LIST) {
 		unsigned int count, i;
 		enum lttng_action_status action_status;
 
@@ -949,16 +958,18 @@ void print_one_trigger(const struct lttng_trigger *trigger)
 		assert(action_status == LTTNG_ACTION_STATUS_OK);
 
 		for (i = 0; i < count; i++) {
+			const uint64_t action_path_index = i;
 			const struct lttng_action *subaction =
 					lttng_action_list_get_at_index(
 							action, i);
 
 			_MSG("    ");
-			print_one_action(trigger, subaction);
+			print_one_action(trigger, subaction, &action_path_index,
+					1);
 		}
 	} else {
 		_MSG(" action:");
-		print_one_action(trigger, action);
+		print_one_action(trigger, action, NULL, 0);
 	}
 
 	print_trigger_errors(trigger);