X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrigger.c;h=dd161eb38420dbc40935674a63fb7bd0308e92d0;hp=13f26d6613dea4a1e6cd469aa034fb34d744cc5f;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=a58c490f0bff52a73717d31d04d1472629180de2

diff --git a/src/common/trigger.c b/src/common/trigger.c
index 13f26d661..dd161eb38 100644
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <lttng/trigger/trigger-internal.h>
@@ -64,12 +54,26 @@ struct lttng_condition *lttng_trigger_get_condition(
 	return trigger ? trigger->condition : NULL;
 }
 
-extern struct lttng_action *lttng_trigger_get_action(
+LTTNG_HIDDEN
+const struct lttng_condition *lttng_trigger_get_const_condition(
+		const struct lttng_trigger *trigger)
+{
+	return trigger->condition;
+}
+
+struct lttng_action *lttng_trigger_get_action(
 		struct lttng_trigger *trigger)
 {
 	return trigger ? trigger->action : NULL;
 }
 
+LTTNG_HIDDEN
+const struct lttng_action *lttng_trigger_get_const_action(
+		const struct lttng_trigger *trigger)
+{
+	return trigger->action;
+}
+
 void lttng_trigger_destroy(struct lttng_trigger *trigger)
 {
 	if (!trigger) {
@@ -141,43 +145,39 @@ error:
 }
 
 /*
- * Returns the size of a trigger (header + condition + action).
  * Both elements are stored contiguously, see their "*_comm" structure
  * for the detailed format.
  */
 LTTNG_HIDDEN
-ssize_t lttng_trigger_serialize(struct lttng_trigger *trigger, char *buf)
+int lttng_trigger_serialize(struct lttng_trigger *trigger,
+		struct lttng_dynamic_buffer *buf)
 {
-	struct lttng_trigger_comm trigger_comm;
-	ssize_t action_size, condition_size, offset = 0, ret;
-
-	if (!trigger) {
-		ret = -1;
+	int ret;
+	size_t header_offset, size_before_payload;
+	struct lttng_trigger_comm trigger_comm = { 0 };
+	struct lttng_trigger_comm *header;
+
+	header_offset = buf->size;
+	ret = lttng_dynamic_buffer_append(buf, &trigger_comm,
+			sizeof(trigger_comm));
+	if (ret) {
 		goto end;
 	}
 
-	offset += sizeof(trigger_comm);
-	condition_size = lttng_condition_serialize(trigger->condition,
-			buf ? (buf + offset) : NULL);
-	if (condition_size < 0) {
-		ret = -1;
+	size_before_payload = buf->size;
+	ret = lttng_condition_serialize(trigger->condition, buf);
+	if (ret) {
 		goto end;
 	}
-	offset += condition_size;
 
-	action_size = lttng_action_serialize(trigger->action,
-			buf ? (buf + offset) : NULL);
-	if (action_size < 0) {
-		ret = -1;
+	ret = lttng_action_serialize(trigger->action, buf);
+	if (ret) {
 		goto end;
 	}
-	offset += action_size;
 
-	if (buf) {
-		trigger_comm.length = (uint32_t) (condition_size + action_size);
-		memcpy(buf, &trigger_comm, sizeof(trigger_comm));
-	}
-	ret = offset;
+	/* Update payload size. */
+	header = (struct lttng_trigger_comm *) ((char *) buf->data + header_offset);
+	header->length = buf->size - size_before_payload;
 end:
 	return ret;
 }