X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=7b9647436ac82e059fdc61aa7216ddbbe9ca9dfc;hb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;hp=cc81906b6267ffc104ee357741d0b099af9fbc3c;hpb=7802bae326824ecb116cb0d782bb7472eaa6f6e4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index cc81906b6..7b9647436 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -29,6 +29,12 @@
 #include <common/utils.h>
 #include <common/compat/string.h>
 #include <common/kernel-ctl/kernel-ctl.h>
+#include <common/dynamic-buffer.h>
+#include <common/buffer-view.h>
+#include <lttng/trigger/trigger-internal.h>
+#include <lttng/condition/condition.h>
+#include <lttng/action/action.h>
+#include <lttng/channel-internal.h>
 
 #include "channel.h"
 #include "consumer.h"
@@ -41,6 +47,8 @@
 #include "syscall.h"
 #include "agent.h"
 #include "buffer-registry.h"
+#include "notification-thread.h"
+#include "notification-thread-commands.h"
 
 #include "cmd.h"
 
@@ -237,7 +245,7 @@ end:
  */
 static void list_lttng_channels(enum lttng_domain_type domain,
 		struct ltt_session *session, struct lttng_channel *channels,
-		struct lttcomm_channel_extended *chan_exts)
+		struct lttng_channel_extended *chan_exts)
 {
 	int i = 0, ret;
 	struct ltt_kernel_channel *kchan;
@@ -251,6 +259,10 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			cds_list_for_each_entry(kchan,
 					&session->kernel_session->channel_list.head, list) {
 				uint64_t discarded_events, lost_packets;
+				struct lttng_channel_extended *extended;
+
+				extended = (struct lttng_channel_extended *)
+						kchan->channel->attr.extended.ptr;
 
 				ret = get_kernel_runtime_stats(session, kchan,
 						&discarded_events, &lost_packets);
@@ -263,6 +275,8 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 				chan_exts[i].discarded_events =
 						discarded_events;
 				chan_exts[i].lost_packets = lost_packets;
+				chan_exts[i].monitor_timer_interval =
+						extended->monitor_timer_interval;
 				i++;
 			}
 		}
@@ -315,6 +329,8 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 			}
 			chan_exts[i].discarded_events = discarded_events;
 			chan_exts[i].lost_packets = lost_packets;
+			chan_exts[i].monitor_timer_interval =
+					uchan->monitor_timer_interval;
 			i++;
 		}
 		rcu_read_unlock();
@@ -1673,7 +1689,7 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 				free(attr);
 				goto error;
 			}
-			free(attr);
+			channel_attr_destroy(attr);
 			chan_ust_created = 1;
 		}
 
@@ -2171,7 +2187,7 @@ error:
 	free(filter_expression);
 	free(filter);
 	free(exclusion);
-	free(attr);
+	channel_attr_destroy(attr);
 	rcu_read_unlock();
 	return ret;
 }
@@ -2940,8 +2956,8 @@ ssize_t cmd_list_channels(enum lttng_domain_type domain,
 
 	if (nb_chan > 0) {
 		const size_t channel_size = sizeof(struct lttng_channel) +
-			sizeof(struct lttcomm_channel_extended);
-		struct lttcomm_channel_extended *channel_exts;
+			sizeof(struct lttng_channel_extended);
+		struct lttng_channel_extended *channel_exts;
 
 		payload_size = nb_chan * channel_size;
 		*channels = zmalloc(payload_size);
@@ -3566,6 +3582,90 @@ end:
 	return ret;
 }
 
+int cmd_register_trigger(struct command_ctx *cmd_ctx, int sock,
+		struct notification_thread_handle *notification_thread)
+{
+	int ret;
+	size_t trigger_len;
+	ssize_t sock_recv_len;
+	struct lttng_trigger *trigger = NULL;
+	struct lttng_buffer_view view;
+	struct lttng_dynamic_buffer trigger_buffer;
+
+	lttng_dynamic_buffer_init(&trigger_buffer);
+	trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
+	ret = lttng_dynamic_buffer_set_size(&trigger_buffer, trigger_len);
+	if (ret) {
+		ret = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	sock_recv_len = lttcomm_recv_unix_sock(sock, trigger_buffer.data,
+			trigger_len);
+	if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
+		ERR("Failed to receive \"register trigger\" command payload");
+		/* TODO: should this be a new error enum ? */
+		ret = LTTNG_ERR_INVALID_TRIGGER;
+		goto end;
+	}
+
+	view = lttng_buffer_view_from_dynamic_buffer(&trigger_buffer, 0, -1);
+	if (lttng_trigger_create_from_buffer(&view, &trigger) !=
+			trigger_len) {
+		ERR("Invalid trigger payload received in \"register trigger\" command");
+		ret = LTTNG_ERR_INVALID_TRIGGER;
+		goto end;
+	}
+
+	ret = notification_thread_command_register_trigger(notification_thread,
+			trigger);
+end:
+	lttng_dynamic_buffer_reset(&trigger_buffer);
+	return ret;
+}
+
+int cmd_unregister_trigger(struct command_ctx *cmd_ctx, int sock,
+		struct notification_thread_handle *notification_thread)
+{
+	int ret;
+	size_t trigger_len;
+	ssize_t sock_recv_len;
+	struct lttng_trigger *trigger = NULL;
+	struct lttng_buffer_view view;
+	struct lttng_dynamic_buffer trigger_buffer;
+
+	lttng_dynamic_buffer_init(&trigger_buffer);
+	trigger_len = (size_t) cmd_ctx->lsm->u.trigger.length;
+	ret = lttng_dynamic_buffer_set_size(&trigger_buffer, trigger_len);
+	if (ret) {
+		ret = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	sock_recv_len = lttcomm_recv_unix_sock(sock, trigger_buffer.data,
+			trigger_len);
+	if (sock_recv_len < 0 || sock_recv_len != trigger_len) {
+		ERR("Failed to receive \"unregister trigger\" command payload");
+		/* TODO: should this be a new error enum ? */
+		ret = LTTNG_ERR_INVALID_TRIGGER;
+		goto end;
+	}
+
+	view = lttng_buffer_view_from_dynamic_buffer(&trigger_buffer, 0, -1);
+	if (lttng_trigger_create_from_buffer(&view, &trigger) !=
+			trigger_len) {
+		ERR("Invalid trigger payload received in \"unregister trigger\" command");
+		ret = LTTNG_ERR_INVALID_TRIGGER;
+		goto end;
+	}
+
+	ret = notification_thread_command_unregister_trigger(notification_thread,
+			trigger);
+end:
+	lttng_dynamic_buffer_reset(&trigger_buffer);
+	return ret;
+}
+
 /*
  * Send relayd sockets from snapshot output to consumer. Ignore request if the
  * snapshot output is *not* set with a remote destination.