X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=4e1665f401a333719b7220638e43a80c95cee4a6;hp=bcd59f0c637979cccb09ce923db97d9146e35508;hb=83b45089a2624e885b0f0308be7ba5b061b23282;hpb=c25613651ac7525a16b9877230a682fc1a64e036

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index bcd59f0c6..4e1665f40 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -36,6 +36,9 @@
 #include <common/utils.h>
 #include <lttng/lttng.h>
 #include <lttng/health-internal.h>
+#include <lttng/trigger/trigger-internal.h>
+#include <lttng/endpoint.h>
+#include <lttng/channel-internal.h>
 
 #include "filter/filter-ast.h"
 #include "filter/filter-parser.h"
@@ -1927,26 +1930,13 @@ int lttng_set_tracing_group(const char *name)
 	return 0;
 }
 
-/*
- * Returns size of returned session payload data or a negative error code.
- */
 int lttng_calibrate(struct lttng_handle *handle,
 		struct lttng_calibrate *calibrate)
 {
-	struct lttcomm_session_msg lsm;
-
-	/* Safety check. NULL pointer are forbidden */
-	if (handle == NULL || calibrate == NULL) {
-		return -LTTNG_ERR_INVALID;
-	}
-
-	memset(&lsm, 0, sizeof(lsm));
-	lsm.cmd_type = LTTNG_CALIBRATE;
-	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
-
-	memcpy(&lsm.u.calibrate, calibrate, sizeof(lsm.u.calibrate));
-
-	return lttng_ctl_ask_sessiond(&lsm, NULL);
+	/*
+	 * This command was removed in LTTng 2.9.
+	 */
+	return -LTTNG_ERR_UND;
 }
 
 /*
@@ -2448,6 +2438,94 @@ 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;
+	if (lttng_trigger_serialize(trigger, trigger_buf) < 0) {
+		ret = -LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	lsm.u.trigger.length = (uint32_t) trigger_size;
+	ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, trigger_buf,
+			trigger_size, NULL);
+end:
+	free(trigger_buf);
+	return ret;
+}
+
+int lttng_unregister_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_UNREGISTER_TRIGGER;
+	if (lttng_trigger_serialize(trigger, trigger_buf) < 0) {
+		ret = -LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	lsm.u.trigger.length = (uint32_t) trigger_size;
+	ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, trigger_buf,
+			trigger_size, NULL);
+end:
+	free(trigger_buf);
+	return ret;
+}
+
 /*
  * lib constructor.
  */