X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fnotification.c;h=674429692aafd25199bf9008287b7d37cc50784d;hp=5062ca5b1afa16f26340871a878801723ffce825;hb=9b63a4aa352c184984395c097f86d5e54c295012;hpb=a58c490f0bff52a73717d31d04d1472629180de2

diff --git a/src/common/notification.c b/src/common/notification.c
index 5062ca5b1..674429692 100644
--- a/src/common/notification.c
+++ b/src/common/notification.c
@@ -40,46 +40,38 @@ struct lttng_notification *lttng_notification_create(
 
 	notification->condition = condition;
 	notification->evaluation = evaluation;
-	notification->owns_elements = false;
 end:
 	return notification;
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_notification_serialize(struct lttng_notification *notification,
-		char *buf)
+int lttng_notification_serialize(const struct lttng_notification *notification,
+		struct lttng_dynamic_buffer *buf)
 {
-	ssize_t ret, condition_size, evaluation_size, offset = 0;
-	struct lttng_notification_comm notification_comm;
-
-	if (!notification) {
-		ret = -1;
-		goto end;
-	}
-
-	offset += sizeof(notification_comm);
-	condition_size = lttng_condition_serialize(notification->condition,
-			buf ? (buf + offset) : NULL);
-	if (condition_size < 0) {
-		ret = condition_size;
+	int ret;
+	size_t header_offset, size_before_payload;
+	struct lttng_notification_comm notification_comm = { 0 };
+	struct lttng_notification_comm *header;
+
+	header_offset = buf->size;
+	ret = lttng_dynamic_buffer_append(buf, &notification_comm,
+			sizeof(notification_comm));
+
+	size_before_payload = buf->size;
+	ret = lttng_condition_serialize(notification->condition,
+			buf);
+	if (ret) {
 		goto end;
 	}
-	offset += condition_size;
 
-	evaluation_size = lttng_evaluation_serialize(notification->evaluation,
-			buf ? (buf + offset) : NULL);
-	if (evaluation_size < 0) {
-		ret = evaluation_size;
+	ret = lttng_evaluation_serialize(notification->evaluation, buf);
+	if (ret) {
 		goto end;
 	}
-	offset += evaluation_size;
 
-	if (buf) {
-		notification_comm.length =
-				(uint32_t) (condition_size + evaluation_size);
-		memcpy(buf, &notification_comm, sizeof(notification_comm));
-	}
-	ret = offset;
+	/* Update payload size. */
+	header = (struct lttng_notification_comm *) ((char *) buf->data + header_offset);
+	header->length = (uint32_t) (buf->size - size_before_payload);
 end:
 	return ret;
 
@@ -141,7 +133,6 @@ ssize_t lttng_notification_create_from_buffer(
 		goto error;
 	}
 	ret = notification_size;
-	(*notification)->owns_elements = true;
 end:
 	return ret;
 error:
@@ -156,10 +147,8 @@ void lttng_notification_destroy(struct lttng_notification *notification)
 		return;
 	}
 
-	if (notification->owns_elements) {
-		lttng_condition_destroy(notification->condition);
-		lttng_evaluation_destroy(notification->evaluation);
-	}
+	lttng_condition_destroy(notification->condition);
+	lttng_evaluation_destroy(notification->evaluation);
 	free(notification);
 }