X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=3349ff000f415d60073760085f8fce0de156c105;hb=f2bda80eb1fe2f73dda9a7590d9960cdccb0f733;hp=9ae4d1974293a9197362f92b244eaca8f3543aff;hpb=bd6661538d573c0798439f2933474f677a857728;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 9ae4d1974..3349ff000 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -4631,11 +4631,11 @@ end:
 	return ret_code;
 }
 
-int cmd_list_triggers(struct command_ctx *cmd_ctx,
+enum lttng_error_code cmd_list_triggers(struct command_ctx *cmd_ctx,
 		struct notification_thread_handle *notification_thread,
 		struct lttng_triggers **return_triggers)
 {
-	int ret = 0;
+	int ret;
 	enum lttng_error_code ret_code;
 	struct lttng_triggers *triggers = NULL;
 
@@ -4643,16 +4643,21 @@ int cmd_list_triggers(struct command_ctx *cmd_ctx,
 	ret_code = notification_thread_command_list_triggers(
 			notification_thread, cmd_ctx->creds.uid, &triggers);
 	if (ret_code != LTTNG_OK) {
-		ret = ret_code;
+		goto end;
+	}
+
+	ret = lttng_triggers_remove_hidden_triggers(triggers);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
 		goto end;
 	}
 
 	*return_triggers = triggers;
 	triggers = NULL;
-	ret = LTTNG_OK;
+	ret_code = LTTNG_OK;
 end:
 	lttng_triggers_destroy(triggers);
-	return ret;
+	return ret_code;
 }
 
 enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cmd_creds,
@@ -4662,7 +4667,7 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 {
 	enum lttng_error_code ret_code;
 	const struct lttng_trigger *query_target_trigger;
-	struct lttng_action *query_target_action = NULL;
+	const struct lttng_action *query_target_action = NULL;
 	struct lttng_trigger *matching_trigger = NULL;
 	const char *trigger_name;
 	uid_t trigger_owner;
@@ -4673,6 +4678,10 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 	case LTTNG_ERROR_QUERY_TARGET_TYPE_TRIGGER:
 		query_target_trigger = lttng_error_query_trigger_borrow_target(query);
 		break;
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_CONDITION:
+		query_target_trigger =
+				lttng_error_query_condition_borrow_target(query);
+		break;
 	case LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION:
 		query_target_trigger = lttng_error_query_action_borrow_trigger_target(
 				query);
@@ -4748,6 +4757,21 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 		}
 
 		break;
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_CONDITION:
+	{
+		trigger_status = lttng_trigger_condition_add_error_results(
+				matching_trigger, results);
+
+		switch (trigger_status) {
+		case LTTNG_TRIGGER_STATUS_OK:
+			break;
+		default:
+			ret_code = LTTNG_ERR_UNK;
+			goto end;
+		}
+
+		break;
+	}
 	case LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION:
 	{
 		const enum lttng_action_status action_status =