X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=7a38699d9c8438cbedd423a12fd2204884dc266f;hb=a5c2d2a71919b8d1542b62f6d32579125cc2c8f8;hp=29ebe9c9ea99ccb76fae9c5d753bf456c53264e5;hpb=e2fc8e9d0b5f237c0f925c68301988ed04a68131;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 29ebe9c9e..7a38699d9 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -23,10 +23,10 @@
 #include <common/compat/errno.h>
 #include <common/compat/string.h>
 #include <common/defaults.h>
-#include <common/dynamic-buffer.h>
 #include <common/dynamic-array.h>
-#include <common/payload.h>
+#include <common/dynamic-buffer.h>
 #include <common/payload-view.h>
+#include <common/payload.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/tracker.h>
 #include <common/unix.h>
@@ -35,19 +35,20 @@
 #include <lttng/channel-internal.h>
 #include <lttng/destruction-handle.h>
 #include <lttng/endpoint.h>
+#include <lttng/error-query-internal.h>
 #include <lttng/event-internal.h>
 #include <lttng/health-internal.h>
+#include <lttng/lttng-error.h>
 #include <lttng/lttng.h>
 #include <lttng/session-descriptor-internal.h>
 #include <lttng/session-internal.h>
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/userspace-probe-internal.h>
-#include <lttng/lttng-error.h>
 
+#include "lttng-ctl-helper.h"
 #include <common/filter/filter-ast.h>
 #include <common/filter/filter-parser.h>
 #include <common/filter/memstream.h>
-#include "lttng-ctl-helper.h"
 
 #define COPY_DOMAIN_PACKED(dst, src)				\
 do {								\
@@ -2070,7 +2071,7 @@ int lttng_destroy_session_no_wait(const char *session_name)
 	enum lttng_error_code ret_code;
 
 	ret_code = lttng_destroy_session_ext(session_name, NULL);
-	return ret_code == LTTNG_OK ? ret_code : -ret_code;
+	return ret_code == LTTNG_OK ? 0 : -ret_code;
 }
 
 /*
@@ -3081,11 +3082,14 @@ end:
 	return ret;
 }
 
-int lttng_register_trigger(struct lttng_trigger *trigger)
+static
+int _lttng_register_trigger(struct lttng_trigger *trigger, const char *name,
+		bool generate_name)
 {
 	int ret;
 	struct lttcomm_session_msg lsm = {
 		.cmd_type = LTTNG_REGISTER_TRIGGER,
+		.u.trigger.is_trigger_anonymous = !name && !generate_name,
 	};
 	struct lttcomm_session_msg *message_lsm;
 	struct lttng_payload message;
@@ -3096,7 +3100,8 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 		.uid = LTTNG_OPTIONAL_INIT_VALUE(geteuid()),
 		.gid = LTTNG_OPTIONAL_INIT_UNSET,
 	};
-
+	const char *unused_trigger_name = NULL;
+	enum lttng_trigger_status trigger_status;
 
 	lttng_payload_init(&message);
 	lttng_payload_init(&reply);
@@ -3106,6 +3111,21 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 		goto end;
 	}
 
+	trigger_status = lttng_trigger_get_name(trigger, &unused_trigger_name);
+	if (trigger_status != LTTNG_TRIGGER_STATUS_UNSET) {
+		/* Re-using already registered trigger. */
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	if (name) {
+		trigger_status = lttng_trigger_set_name(trigger, name);
+		if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+			ret = -LTTNG_ERR_NOMEM;
+			goto end;
+		}
+	}
+
 	if (!trigger->creds.uid.is_set) {
 		/* Use the client's credentials as the trigger credentials. */
 		lttng_trigger_set_credentials(trigger, &user_creds);
@@ -3126,14 +3146,14 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 		if (!lttng_credentials_is_equal_uid(trigger_creds, &user_creds)) {
 			if (lttng_credentials_get_uid(&user_creds) != 0) {
 				ret = -LTTNG_ERR_EPERM;
-				goto end;
+				goto end_unset_name;
 			}
 		}
 	}
 
 	if (!lttng_trigger_validate(trigger)) {
 		ret = -LTTNG_ERR_INVALID_TRIGGER;
-		goto end;
+		goto end_unset_name;
 	}
 
 	domain_type = lttng_trigger_get_underlying_domain_type_restriction(
@@ -3144,13 +3164,13 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 	ret = lttng_dynamic_buffer_append(&message.buffer, &lsm, sizeof(lsm));
 	if (ret) {
 		ret = -LTTNG_ERR_NOMEM;
-		goto end;
+		goto end_unset_name;
 	}
 
 	ret = lttng_trigger_serialize(trigger, &message);
 	if (ret < 0) {
 		ret = -LTTNG_ERR_UNK;
-		goto end;
+		goto end_unset_name;
 	}
 
 	/*
@@ -3170,7 +3190,7 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 				&message_view);
 		ret = lttng_ctl_ask_sessiond_payload(&message_view, &reply);
 		if (ret < 0) {
-			goto end;
+			goto end_unset_name;
 		}
 	}
 
@@ -3182,18 +3202,27 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 		ret = lttng_trigger_create_from_payload(
 				&reply_view, &reply_trigger);
 		if (ret < 0) {
-			ret = -LTTNG_ERR_FATAL;
-			goto end;
+			ret = -LTTNG_ERR_INVALID_PROTOCOL;
+			goto end_unset_name;
 		}
 	}
 
-	ret = lttng_trigger_assign_name(trigger, reply_trigger);
-	if (ret < 0) {
-		ret = -LTTNG_ERR_FATAL;
-		goto end;
+	if (name || generate_name) {
+		ret = lttng_trigger_assign_name(trigger, reply_trigger);
+		if (ret < 0) {
+			ret = -LTTNG_ERR_NOMEM;
+			goto end;
+		}
 	}
 
 	ret = 0;
+	goto end;
+
+end_unset_name:
+	trigger_status = lttng_trigger_set_name(trigger, NULL);
+	if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+		ret = -LTTNG_ERR_UNK;
+	}
 end:
 	lttng_payload_reset(&message);
 	lttng_payload_reset(&reply);
@@ -3201,6 +3230,106 @@ end:
 	return ret;
 }
 
+int lttng_register_trigger(struct lttng_trigger *trigger)
+{
+	/* Register an anonymous trigger. */
+	return _lttng_register_trigger(trigger, NULL, false);
+}
+
+enum lttng_error_code lttng_register_trigger_with_name(
+		struct lttng_trigger *trigger, const char *name)
+{
+	const int ret = _lttng_register_trigger(trigger, name, false);
+
+	return ret == 0 ? LTTNG_OK : (enum lttng_error_code) -ret;
+}
+
+enum lttng_error_code lttng_register_trigger_with_automatic_name(
+		struct lttng_trigger *trigger)
+{
+	const int ret =  _lttng_register_trigger(trigger, false, true);
+
+	return ret == 0 ? LTTNG_OK : (enum lttng_error_code) -ret;
+}
+
+enum lttng_error_code lttng_error_query_execute(
+		const struct lttng_error_query *query,
+		const struct lttng_endpoint *endpoint,
+		struct lttng_error_query_results **results)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	struct lttcomm_session_msg lsm = {
+		.cmd_type = LTTNG_EXECUTE_ERROR_QUERY,
+	};
+	struct lttng_payload message;
+	struct lttng_payload reply;
+	struct lttcomm_session_msg *message_lsm;
+
+	lttng_payload_init(&message);
+	lttng_payload_init(&reply);
+
+	if (!query || !results) {
+		ret_code = LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	if (endpoint != lttng_session_daemon_command_endpoint) {
+		ret_code = LTTNG_ERR_INVALID_ERROR_QUERY_TARGET;
+		goto end;
+	}
+
+	ret = lttng_dynamic_buffer_append(&message.buffer, &lsm, sizeof(lsm));
+	if (ret) {
+		ret_code = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	ret = lttng_error_query_serialize(query, &message);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	message_lsm = (struct lttcomm_session_msg *) message.buffer.data;
+	message_lsm->u.error_query.length =
+			(uint32_t) message.buffer.size - sizeof(lsm);
+
+	{
+		struct lttng_payload_view message_view =
+				lttng_payload_view_from_payload(
+						&message, 0, -1);
+
+		message_lsm->fd_count = lttng_payload_view_get_fd_handle_count(
+				&message_view);
+		ret = lttng_ctl_ask_sessiond_payload(&message_view, &reply);
+		if (ret < 0) {
+			ret_code = -ret;
+			goto end;
+		}
+	}
+
+	{
+		ssize_t reply_create_ret;
+		struct lttng_payload_view reply_view =
+				lttng_payload_view_from_payload(
+						&reply, 0, reply.buffer.size);
+
+		reply_create_ret = lttng_error_query_results_create_from_payload(
+				&reply_view, results);
+		if (reply_create_ret < 0) {
+			ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+			goto end;
+		}
+	}
+
+	ret_code = LTTNG_OK;
+end:
+	lttng_payload_reset(&message);
+	lttng_payload_reset(&reply);
+	return ret_code;
+}
+
 int lttng_unregister_trigger(const struct lttng_trigger *trigger)
 {
 	int ret;
@@ -3266,18 +3395,18 @@ int lttng_unregister_trigger(const struct lttng_trigger *trigger)
 		goto end;
 	}
 
-	/*
-	 * This is needed to populate the trigger object size for the command
-	 * header and number of fds sent.
-	*/
-	message_lsm = (struct lttcomm_session_msg *) message.buffer.data;
-
 	ret = lttng_trigger_serialize(copy, &message);
 	if (ret < 0) {
 		ret = -LTTNG_ERR_UNK;
 		goto end;
 	}
 
+	/*
+	 * This is needed to populate the trigger object size for the command
+	 * header and number of fds sent.
+	*/
+	message_lsm = (struct lttcomm_session_msg *) message.buffer.data;
+
 	message_lsm->u.trigger.length = (uint32_t) message.buffer.size - sizeof(lsm);
 
 	{