From a440a54282d2b4b38879711b247c23c0c20d69ba Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Tue, 28 Feb 2017 22:08:05 -0500
Subject: [PATCH] lttng-ctl: register trigger to session daemon
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/common/sessiond-comm/sessiond-comm.h |  5 +++
 src/lib/lttng-ctl/lttng-ctl.c            | 46 ++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 0c2667031..90f7bfbe3 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -29,6 +29,7 @@
 #include <lttng/lttng.h>
 #include <lttng/snapshot-internal.h>
 #include <lttng/save-internal.h>
+#include <lttng/trigger/trigger-internal.h>
 #include <common/compat/socket.h>
 #include <common/uri.h>
 #include <common/defaults.h>
@@ -96,6 +97,7 @@ enum lttcomm_sessiond_command {
 	LTTNG_SET_SESSION_SHM_PATH          = 40,
 	LTTNG_REGENERATE_METADATA           = 41,
 	LTTNG_REGENERATE_STATEDUMP          = 42,
+	LTTNG_REGISTER_TRIGGER              = 43,
 };
 
 enum lttcomm_relayd_command {
@@ -311,6 +313,9 @@ struct lttcomm_session_msg {
 		struct {
 			uint32_t pid;
 		} LTTNG_PACKED pid_tracker;
+		struct {
+			struct lttng_trigger_comm header;
+		} LTTNG_PACKED trigger;
 	} u;
 } LTTNG_PACKED;
 
diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index f0b211c7b..06e943d27 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -36,6 +36,8 @@
 #include <common/utils.h>
 #include <lttng/lttng.h>
 #include <lttng/health-internal.h>
+#include <lttng/trigger/trigger-internal.h>
+#include <lttng/endpoint.h>
 
 #include "filter/filter-ast.h"
 #include "filter/filter-parser.h"
@@ -2435,6 +2437,50 @@ end:
 	return ret;
 }
 
+int lttng_register_trigger(struct lttng_trigger *trigger)
+{
+	int ret;
+	struct lttcomm_session_msg lsm;
+	char *trigger_buf = NULL;
+	ssize_t trigger_size;
+
+	if (!trigger) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	if (!lttng_trigger_validate(trigger)) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	trigger_size = lttng_trigger_serialize(trigger, NULL);
+	if (trigger_size < 0) {
+		ret = -LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	trigger_buf = zmalloc(trigger_size);
+	if (!trigger_buf) {
+		ret = -LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	memset(&lsm, 0, sizeof(lsm));
+	lsm.cmd_type = LTTNG_REGISTER_TRIGGER;
+	lsm.u.trigger.header.len = (uint32_t) trigger_size;
+	if (lttng_trigger_serialize(trigger, trigger_buf) < 0) {
+		ret = -LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, trigger_buf,
+			trigger_size, NULL);
+end:
+	free(trigger_buf);
+	return ret;
+}
+
 /*
  * lib constructor.
  */
-- 
2.34.1