SoW-2019-0002: Dynamic Snapshot

[lttng-tools.git] / src / common / notification.c

diff --git a/src/common/notification.c b/src/common/notification.c
index 785af6816f4453e5ed2b06e5845f3eea1f5e4e6c..87f1a8a41345014bb404cd3dade439dde3b98936 100644 (file)
--- a/src/common/notification.c
+++ b/src/common/notification.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/notification/notification-internal.h>
@@ -40,46 +30,40 @@ 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;
+       int ret;
+       size_t header_offset, size_before_payload;
        struct lttng_notification_comm notification_comm = { 0 };
+       struct lttng_notification_comm *header;
 
-       if (!notification) {
-               ret = -1;
+       header_offset = buf->size;
+       ret = lttng_dynamic_buffer_append(buf, &notification_comm,
+                       sizeof(notification_comm));
+       if (ret) {
                goto end;
        }
 
-       offset += sizeof(notification_comm);
-       condition_size = lttng_condition_serialize(notification->condition,
-                       buf ? (buf + offset) : NULL);
-       if (condition_size < 0) {
-               ret = condition_size;
+       size_before_payload = buf->size;
+       ret = lttng_condition_serialize(notification->condition, buf, NULL);
+       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 +125,6 @@ ssize_t lttng_notification_create_from_buffer(
                goto error;
        }
        ret = notification_size;
-       (*notification)->owns_elements = true;
 end:
        return ret;
 error:
@@ -156,10 +139,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);
 }