X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrigger.c;h=2ccf0073589a64d3f5fb8fc98bb5daea3b5bb848;hp=dd161eb38420dbc40935674a63fb7bd0308e92d0;hb=7ca172c15891d4ff3f711dcc05f991fd2c094bc7;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a

diff --git a/src/common/trigger.c b/src/common/trigger.c
index dd161eb38..2ccf00735 100644
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -8,7 +8,11 @@
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/condition/condition-internal.h>
 #include <lttng/action/action-internal.h>
+#include <common/credentials.h>
+#include <common/payload.h>
+#include <common/payload-view.h>
 #include <common/error.h>
+#include <common/optional.h>
 #include <assert.h>
 
 LTTNG_HIDDEN
@@ -42,12 +46,21 @@ struct lttng_trigger *lttng_trigger_create(
 		goto end;
 	}
 
+	lttng_condition_get(condition);
 	trigger->condition = condition;
+
+	lttng_action_get(action);
 	trigger->action = action;
+
 end:
 	return trigger;
 }
 
+/*
+ * Note: the lack of reference counting 'get' on the condition object is normal.
+ * This API was exposed as such in 2.11. The client is not expected to call
+ * lttng_condition_destroy on the returned object.
+ */
 struct lttng_condition *lttng_trigger_get_condition(
 		struct lttng_trigger *trigger)
 {
@@ -61,6 +74,12 @@ const struct lttng_condition *lttng_trigger_get_const_condition(
 	return trigger->condition;
 }
 
+
+/*
+ * Note: the lack of reference counting 'get' on the action object is normal.
+ * This API was exposed as such in 2.11. The client is not expected to call
+ * lttng_action_destroy on the returned object.
+ */
 struct lttng_action *lttng_trigger_get_action(
 		struct lttng_trigger *trigger)
 {
@@ -76,24 +95,33 @@ const struct lttng_action *lttng_trigger_get_const_action(
 
 void lttng_trigger_destroy(struct lttng_trigger *trigger)
 {
+	struct lttng_action *action = lttng_trigger_get_action(trigger);
+	struct lttng_condition *condition =
+			lttng_trigger_get_condition(trigger);
+
 	if (!trigger) {
 		return;
 	}
 
+	assert(action);
+	assert(condition);
+
+	/* Release ownership. */
+	lttng_action_put(action);
+	lttng_condition_put(condition);
+
 	free(trigger);
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_trigger_create_from_buffer(
-		const struct lttng_buffer_view *src_view,
+ssize_t lttng_trigger_create_from_payload(
+		struct lttng_payload_view *src_view,
 		struct lttng_trigger **trigger)
 {
 	ssize_t ret, offset = 0, condition_size, action_size;
 	struct lttng_condition *condition = NULL;
 	struct lttng_action *action = NULL;
 	const struct lttng_trigger_comm *trigger_comm;
-	struct lttng_buffer_view condition_view;
-	struct lttng_buffer_view action_view;
 
 	if (!src_view || !trigger) {
 		ret = -1;
@@ -101,23 +129,33 @@ ssize_t lttng_trigger_create_from_buffer(
 	}
 
 	/* lttng_trigger_comm header */
-	trigger_comm = (const struct lttng_trigger_comm *) src_view->data;
+	trigger_comm = (typeof(trigger_comm)) src_view->buffer.data;
 	offset += sizeof(*trigger_comm);
+	{
+		/* struct lttng_condition */
+		struct lttng_payload_view condition_view =
+				lttng_payload_view_from_view(
+						src_view, offset, -1);
+
+		condition_size = lttng_condition_create_from_payload(&condition_view,
+				&condition);
+	}
 
-	condition_view = lttng_buffer_view_from_view(src_view, offset, -1);
-
-	/* struct lttng_condition */
-	condition_size = lttng_condition_create_from_buffer(&condition_view,
-			&condition);
 	if (condition_size < 0) {
 		ret = condition_size;
 		goto end;
 	}
+
 	offset += condition_size;
+	{
+		/* struct lttng_action */
+		struct lttng_payload_view action_view =
+				lttng_payload_view_from_view(
+					src_view, offset, -1);
+
+		action_size = lttng_action_create_from_payload(&action_view, &action);
+	}
 
-	/* struct lttng_action */
-	action_view = lttng_buffer_view_from_view(src_view, offset, -1);
-	action_size = lttng_action_create_from_buffer(&action_view, &action);
 	if (action_size < 0) {
 		ret = action_size;
 		goto end;
@@ -135,12 +173,23 @@ ssize_t lttng_trigger_create_from_buffer(
 		ret = -1;
 		goto error;
 	}
+
+	/*
+	 * The trigger object owns references to the action and condition
+	 * objects.
+	 */
+	lttng_condition_put(condition);
+	condition = NULL;
+
+	lttng_action_put(action);
+	action = NULL;
+
 	ret = offset;
-end:
-	return ret;
+
 error:
 	lttng_condition_destroy(condition);
 	lttng_action_destroy(action);
+end:
 	return ret;
 }
 
@@ -150,34 +199,50 @@ error:
  */
 LTTNG_HIDDEN
 int lttng_trigger_serialize(struct lttng_trigger *trigger,
-		struct lttng_dynamic_buffer *buf)
+		struct lttng_payload *payload)
 {
 	int ret;
 	size_t header_offset, size_before_payload;
-	struct lttng_trigger_comm trigger_comm = { 0 };
+	struct lttng_trigger_comm trigger_comm = {};
 	struct lttng_trigger_comm *header;
 
-	header_offset = buf->size;
-	ret = lttng_dynamic_buffer_append(buf, &trigger_comm,
+	header_offset = payload->buffer.size;
+	ret = lttng_dynamic_buffer_append(&payload->buffer, &trigger_comm,
 			sizeof(trigger_comm));
 	if (ret) {
 		goto end;
 	}
 
-	size_before_payload = buf->size;
-	ret = lttng_condition_serialize(trigger->condition, buf);
+	size_before_payload = payload->buffer.size;
+	ret = lttng_condition_serialize(trigger->condition, payload);
 	if (ret) {
 		goto end;
 	}
 
-	ret = lttng_action_serialize(trigger->action, buf);
+	ret = lttng_action_serialize(trigger->action, payload);
 	if (ret) {
 		goto end;
 	}
 
 	/* Update payload size. */
-	header = (struct lttng_trigger_comm *) ((char *) buf->data + header_offset);
-	header->length = buf->size - size_before_payload;
+	header = (typeof(header)) (payload->buffer.data + header_offset);
+	header->length = payload->buffer.size - size_before_payload;
 end:
 	return ret;
 }
+
+LTTNG_HIDDEN
+const struct lttng_credentials *lttng_trigger_get_credentials(
+		const struct lttng_trigger *trigger)
+{
+	return LTTNG_OPTIONAL_GET_PTR(trigger->creds);
+}
+
+LTTNG_HIDDEN
+void lttng_trigger_set_credentials(
+		struct lttng_trigger *trigger,
+		const struct lttng_credentials *creds)
+{
+	assert(creds);
+	LTTNG_OPTIONAL_SET(&trigger->creds, *creds);
+}