X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=7efc6bd2ebea7ef007c14a164b43cee48ecc3519;hb=b0a79813263e65e177c2cca7a352c8b364a02b22;hp=5529b3364f12027c8b143fbdcba8a4e7304dad70;hpb=b61776fb63d4bb14df77c0b5a15de28beed7ddfc;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 5529b3364..7efc6bd2e 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -18,14 +18,15 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <common/bytecode/bytecode.h>
 #include <common/common.h>
 #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>
@@ -34,20 +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/filter-bytecode.h>
 #include <common/filter/memstream.h>
-#include "lttng-ctl-helper.h"
 
 #define COPY_DOMAIN_PACKED(dst, src)				\
 do {								\
@@ -1270,15 +1271,15 @@ int lttng_enable_event_with_exclusions(struct lttng_handle *handle,
 
 		assert(fd_count == 0 || fd_count == 1);
 		if (fd_count == 1) {
-			struct fd_handle *handle =
+			struct fd_handle *h =
 					lttng_payload_view_pop_fd_handle(&view);
 
-			if (!handle) {
+			if (!h) {
 				goto mem_error;
 			}
 
-			fd_to_send = fd_handle_get_fd(handle);
-			fd_handle_put(handle);
+			fd_to_send = fd_handle_get_fd(h);
+			fd_handle_put(h);
 		}
 
 		ret = lttng_ctl_ask_sessiond_fds_varlen(&lsm,
@@ -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;
 }
 
 /*
@@ -3097,7 +3098,6 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 		.gid = LTTNG_OPTIONAL_INIT_UNSET,
 	};
 
-
 	lttng_payload_init(&message);
 	lttng_payload_init(&reply);
 
@@ -3201,6 +3201,84 @@ end:
 	return 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 +3344,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);
 
 	{