X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=3ccc29efceaf335a71ce0bc3c5d705aaefd90619;hp=d7db03fa76981f38ac60b3eb9e78579c9512fa4b;hb=9124c6304bba12b0d4424b4071a25a34445ff4da;hpb=1434fd36db67bc476bb9d572bd9a0097528211bb

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index d7db03fa7..3ccc29efc 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -769,8 +769,9 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 		int *sock_error)
 {
 	int ret = LTTNG_OK;
-	int need_tracing_session = 1;
-	int need_domain;
+	bool need_tracing_session = true;
+	bool need_domain;
+	bool need_consumerd;
 
 	DBG("Processing client command %d", cmd_ctx->lsm.cmd_type);
 
@@ -794,17 +795,27 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_SET_SESSION_SHM_PATH:
 	case LTTNG_REGENERATE_METADATA:
 	case LTTNG_REGENERATE_STATEDUMP:
-	case LTTNG_REGISTER_TRIGGER:
-	case LTTNG_UNREGISTER_TRIGGER:
 	case LTTNG_ROTATE_SESSION:
 	case LTTNG_ROTATION_GET_INFO:
 	case LTTNG_ROTATION_SET_SCHEDULE:
 	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 	case LTTNG_CLEAR_SESSION:
-		need_domain = 0;
+	case LTTNG_LIST_TRIGGERS:
+		need_domain = false;
 		break;
 	default:
-		need_domain = 1;
+		need_domain = true;
+	}
+
+	/* Needs a functioning consumerd? */
+	switch (cmd_ctx->lsm.cmd_type) {
+	case LTTNG_REGISTER_TRIGGER:
+	case LTTNG_UNREGISTER_TRIGGER:
+		need_consumerd = false;
+		break;
+	default:
+		need_consumerd = true;
+		break;
 	}
 
 	if (config.no_kernel && need_domain
@@ -847,6 +858,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_DATA_PENDING:
 	case LTTNG_ROTATE_SESSION:
 	case LTTNG_ROTATION_GET_INFO:
+	case LTTNG_REGISTER_TRIGGER:
+	case LTTNG_LIST_TRIGGERS:
 		break;
 	default:
 		/* Setup lttng message with no payload */
@@ -867,7 +880,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_SAVE_SESSION:
 	case LTTNG_REGISTER_TRIGGER:
 	case LTTNG_UNREGISTER_TRIGGER:
-		need_tracing_session = 0;
+	case LTTNG_LIST_TRIGGERS:
+		need_tracing_session = false;
 		break;
 	default:
 		DBG("Getting session %s by name", cmd_ctx->lsm.session.name);
@@ -945,7 +959,8 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 		}
 
 		/* Consumer is in an ERROR state. Report back to client */
-		if (uatomic_read(&kernel_consumerd_state) == CONSUMER_ERROR) {
+		if (need_consumerd && uatomic_read(&kernel_consumerd_state) ==
+						      CONSUMER_ERROR) {
 			ret = LTTNG_ERR_NO_KERNCONSUMERD;
 			goto error;
 		}
@@ -996,8 +1011,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			ret = LTTNG_ERR_NO_UST;
 			goto error;
 		}
+
 		/* Consumer is in an ERROR state. Report back to client */
-		if (uatomic_read(&ust_consumerd_state) == CONSUMER_ERROR) {
+		if (need_consumerd && uatomic_read(&ust_consumerd_state) ==
+						      CONSUMER_ERROR) {
 			ret = LTTNG_ERR_NO_USTCONSUMERD;
 			goto error;
 		}
@@ -1334,6 +1351,11 @@ error_add_context:
 
 		payload_view = lttng_buffer_view_from_dynamic_buffer(
 				&payload, 0, name_len);
+		if (name_len > 0 && !lttng_buffer_view_is_valid(&payload_view)) {
+			ret = LTTNG_ERR_INVALID_PROTOCOL;
+			goto error_add_remove_tracker_value;
+		}
+
 		/*
 		 * Validate the value type and domains are legal for the process
 		 * attribute tracker that is specified and convert the value to
@@ -2033,8 +2055,41 @@ error_add_context:
 	}
 	case LTTNG_REGISTER_TRIGGER:
 	{
+		struct lttng_trigger *return_trigger;
+		size_t original_payload_size;
+		size_t payload_size;
+
+		ret = setup_empty_lttng_msg(cmd_ctx);
+		if (ret) {
+			ret = LTTNG_ERR_NOMEM;
+			goto setup_error;
+		}
+
+		original_payload_size = cmd_ctx->reply_payload.buffer.size;
+
 		ret = cmd_register_trigger(cmd_ctx, *sock,
-				notification_thread_handle);
+				notification_thread_handle, &return_trigger);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		ret = lttng_trigger_serialize(return_trigger, &cmd_ctx->reply_payload);
+		if (ret) {
+			ERR("Failed to serialize trigger in reply to \"register trigger\" command");
+			ret = LTTNG_ERR_NOMEM;
+			lttng_trigger_destroy(return_trigger);
+			goto error;
+		}
+
+		lttng_trigger_destroy(return_trigger);
+		return_trigger = NULL;
+
+		payload_size = cmd_ctx->reply_payload.buffer.size -
+			original_payload_size;
+
+		update_lttng_msg(cmd_ctx, 0, payload_size);
+
+		ret = LTTNG_OK;
 		break;
 	}
 	case LTTNG_UNREGISTER_TRIGGER:
@@ -2147,6 +2202,44 @@ error_add_context:
 		ret = cmd_clear_session(cmd_ctx->session, sock);
 		break;
 	}
+	case LTTNG_LIST_TRIGGERS:
+	{
+		struct lttng_triggers *return_triggers = NULL;
+		size_t original_payload_size;
+		size_t payload_size;
+
+		ret = setup_empty_lttng_msg(cmd_ctx);
+		if (ret) {
+			ret = LTTNG_ERR_NOMEM;
+			goto setup_error;
+		}
+
+		original_payload_size = cmd_ctx->reply_payload.buffer.size;
+
+		ret = cmd_list_triggers(cmd_ctx,
+				notification_thread_handle, &return_triggers);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		assert(return_triggers);
+		ret = lttng_triggers_serialize(
+				return_triggers, &cmd_ctx->reply_payload);
+		lttng_triggers_destroy(return_triggers);
+		if (ret) {
+			ERR("Failed to serialize triggers in reply to `list triggers` command");
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
+		}
+
+		payload_size = cmd_ctx->reply_payload.buffer.size -
+			original_payload_size;
+
+		update_lttng_msg(cmd_ctx, 0, payload_size);
+
+		ret = LTTNG_OK;
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UND;
 		break;