X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrigger.c;h=af0c5fa348166b833c61331f19f2cc2dba69567d;hp=e6849fccfa52789a022de29b4344f2ead73fbffd;hb=242388e491e4219f967ee424d7bf02035a313e6f;hpb=28b3dc1e1eca004cae6023b8e491835ecdfdd041

diff --git a/src/common/trigger.c b/src/common/trigger.c
index e6849fccf..af0c5fa34 100644
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -14,6 +14,7 @@
 #include <common/error.h>
 #include <common/optional.h>
 #include <assert.h>
+#include <inttypes.h>
 
 LTTNG_HIDDEN
 bool lttng_trigger_validate(struct lttng_trigger *trigger)
@@ -115,6 +116,7 @@ static void trigger_destroy_ref(struct urcu_ref *ref)
 	lttng_action_put(action);
 	lttng_condition_put(condition);
 
+	free(trigger->name);
 	free(trigger);
 }
 
@@ -128,10 +130,11 @@ 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;
+	ssize_t ret, offset = 0, condition_size, action_size, name_size = 0;
 	struct lttng_condition *condition = NULL;
 	struct lttng_action *action = NULL;
 	const struct lttng_trigger_comm *trigger_comm;
+	const char *name = NULL;
 	struct lttng_credentials creds = {
 		.uid = LTTNG_OPTIONAL_INIT_UNSET,
 		.gid = LTTNG_OPTIONAL_INIT_UNSET,
@@ -155,6 +158,24 @@ ssize_t lttng_trigger_create_from_payload(
 	LTTNG_OPTIONAL_SET(&creds.uid, trigger_comm->uid);
 
 	offset += sizeof(*trigger_comm);
+
+	if (trigger_comm->name_length != 0) {
+		/* Name. */
+		const struct lttng_payload_view name_view =
+				lttng_payload_view_from_view(
+						src_view, offset, trigger_comm->name_length);
+
+		name = name_view.buffer.data;
+		if (!lttng_buffer_view_contains_string(&name_view.buffer, name,
+				    trigger_comm->name_length)) {
+			ret = -1;
+			goto end;
+		}
+
+		offset += trigger_comm->name_length;
+		name_size = trigger_comm->name_length;
+	}
+
 	{
 		/* struct lttng_condition */
 		struct lttng_payload_view condition_view =
@@ -187,7 +208,7 @@ ssize_t lttng_trigger_create_from_payload(
 	offset += action_size;
 
 	/* Unexpected size of inner-elements; the buffer is corrupted. */
-	if ((ssize_t) trigger_comm->length != condition_size + action_size) {
+	if ((ssize_t) trigger_comm->length != condition_size + action_size + name_size) {
 		ret = -1;
 		goto error;
 	}
@@ -210,6 +231,16 @@ ssize_t lttng_trigger_create_from_payload(
 	lttng_action_put(action);
 	action = NULL;
 
+	if (name) {
+		const enum lttng_trigger_status status =
+				lttng_trigger_set_name(*trigger, name);
+
+		if (status != LTTNG_TRIGGER_STATUS_OK) {
+			ret = -1;
+			goto end;
+		}
+	}
+
 	ret = offset;
 
 error:
@@ -228,7 +259,7 @@ int lttng_trigger_serialize(struct lttng_trigger *trigger,
 		struct lttng_payload *payload)
 {
 	int ret;
-	size_t header_offset, size_before_payload;
+	size_t header_offset, size_before_payload, size_name;
 	struct lttng_trigger_comm trigger_comm = {};
 	struct lttng_trigger_comm *header;
 	const struct lttng_credentials *creds = NULL;
@@ -238,6 +269,14 @@ int lttng_trigger_serialize(struct lttng_trigger *trigger,
 
 	trigger_comm.uid = LTTNG_OPTIONAL_GET(creds->uid);
 
+	if (trigger->name != NULL) {
+		size_name = strlen(trigger->name) + 1;
+	} else {
+		size_name = 0;
+	}
+
+	trigger_comm.name_length = size_name;
+
 	header_offset = payload->buffer.size;
 	ret = lttng_dynamic_buffer_append(&payload->buffer, &trigger_comm,
 			sizeof(trigger_comm));
@@ -246,6 +285,14 @@ int lttng_trigger_serialize(struct lttng_trigger *trigger,
 	}
 
 	size_before_payload = payload->buffer.size;
+
+	/* Trigger name. */
+	ret = lttng_dynamic_buffer_append(
+			&payload->buffer, trigger->name, size_name);
+	if (ret) {
+		goto end;
+	}
+
 	ret = lttng_condition_serialize(trigger->condition, payload);
 	if (ret) {
 		goto end;
@@ -286,6 +333,89 @@ bool lttng_trigger_is_equal(
 	return true;
 }
 
+enum lttng_trigger_status lttng_trigger_set_name(struct lttng_trigger *trigger,
+		const char* name)
+{
+	char *name_copy = NULL;
+	enum lttng_trigger_status status = LTTNG_TRIGGER_STATUS_OK;
+
+	if (!trigger || !name ||
+			strlen(name) == 0) {
+		status = LTTNG_TRIGGER_STATUS_INVALID;
+		goto end;
+	}
+
+	name_copy = strdup(name);
+	if (!name_copy) {
+		status = LTTNG_TRIGGER_STATUS_ERROR;
+		goto end;
+	}
+
+	free(trigger->name);
+
+	trigger->name = name_copy;
+	name_copy = NULL;
+end:
+	return status;
+}
+
+enum lttng_trigger_status lttng_trigger_get_name(
+		const struct lttng_trigger *trigger, const char **name)
+{
+	enum lttng_trigger_status status = LTTNG_TRIGGER_STATUS_OK;
+
+	if (!trigger || !name) {
+		status = LTTNG_TRIGGER_STATUS_INVALID;
+		goto end;
+	}
+
+	if (!trigger->name) {
+		status = LTTNG_TRIGGER_STATUS_UNSET;
+	}
+
+	*name = trigger->name;
+end:
+	return status;
+}
+
+LTTNG_HIDDEN
+int lttng_trigger_assign_name(struct lttng_trigger *dst,
+		const struct lttng_trigger *src)
+{
+	int ret = 0;
+	enum lttng_trigger_status status;
+
+	status = lttng_trigger_set_name(dst, src->name);
+	if (status != LTTNG_TRIGGER_STATUS_OK) {
+		ret = -1;
+		ERR("Failed to set name for trigger");
+		goto end;
+	}
+end:
+	return ret;
+}
+
+LTTNG_HIDDEN
+int lttng_trigger_generate_name(struct lttng_trigger *trigger,
+		uint64_t unique_id)
+{
+	int ret = 0;
+	char *generated_name = NULL;
+
+	ret = asprintf(&generated_name, "T%" PRIu64 "", unique_id);
+	if (ret < 0) {
+		ERR("Failed to generate trigger name");
+		ret = -1;
+		goto end;
+	}
+
+	ret = 0;
+	free(trigger->name);
+	trigger->name = generated_name;
+end:
+	return ret;
+}
+
 LTTNG_HIDDEN
 void lttng_trigger_get(struct lttng_trigger *trigger)
 {