X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcondition.c;h=367f4a38b6b977045c3e97a7572d9e607f462ef8;hp=ceab81eabbd81a6928a9b6122a6fdb117940a4b8;hb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1;hpb=d184b96cb8d5bd26fcef718acc447eb55f10ed08

diff --git a/src/common/condition.c b/src/common/condition.c
index ceab81eab..367f4a38b 100644
--- a/src/common/condition.c
+++ b/src/common/condition.c
@@ -1,22 +1,14 @@
 /*
- * 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/condition/condition-internal.h>
 #include <lttng/condition/buffer-usage-internal.h>
+#include <lttng/condition/session-consumed-size-internal.h>
+#include <lttng/condition/session-rotation-internal.h>
 #include <common/macros.h>
 #include <common/error.h>
 #include <common/dynamic-buffer.h>
@@ -62,31 +54,29 @@ end:
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_condition_serialize(const struct lttng_condition *condition,
-		char *buf)
+int lttng_condition_serialize(const struct lttng_condition *condition,
+		struct lttng_payload *payload)
 {
-	ssize_t ret, condition_size;
-	struct lttng_condition_comm condition_comm = {
-		.condition_type = (int8_t) condition->type
-	};
+	int ret;
+	struct lttng_condition_comm condition_comm = {};
 
 	if (!condition) {
 		ret = -1;
 		goto end;
 	}
 
-	ret = sizeof(struct lttng_condition_comm);
-	if (buf) {
-		memcpy(buf, &condition_comm, ret);
-		buf += ret;
+	condition_comm.condition_type = (int8_t) condition->type;
+
+	ret = lttng_dynamic_buffer_append(&payload->buffer, &condition_comm,
+			sizeof(condition_comm));
+	if (ret) {
+		goto end;
 	}
 
-	condition_size = condition->serialize(condition, buf);
-	if (condition_size < 0) {
-		ret = condition_size;
+	ret = condition->serialize(condition, payload);
+	if (ret) {
 		goto end;
 	}
-	ret += condition_size;
 end:
 	return ret;
 }
@@ -105,35 +95,49 @@ bool lttng_condition_is_equal(const struct lttng_condition *a,
 		goto end;
 	}
 
+	if (a == b) {
+		is_equal = true;
+		goto end;
+	}
+
 	is_equal = a->equal ? a->equal(a, b) : true;
 end:
 	return is_equal;
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_condition_create_from_buffer(
-		const struct lttng_buffer_view *buffer,
+ssize_t lttng_condition_create_from_payload(
+		struct lttng_payload_view *view,
 		struct lttng_condition **condition)
 {
 	ssize_t ret, condition_size = 0;
 	const struct lttng_condition_comm *condition_comm;
-	condition_create_from_buffer_cb create_from_buffer = NULL;
+	condition_create_from_payload_cb create_from_payload = NULL;
 
-	if (!buffer || !condition) {
+	if (!view || !condition) {
 		ret = -1;
 		goto end;
 	}
 
 	DBG("Deserializing condition from buffer");
-	condition_comm = (const struct lttng_condition_comm *) buffer->data;
+	condition_comm = (typeof(condition_comm)) view->buffer.data;
 	condition_size += sizeof(*condition_comm);
 
 	switch ((enum lttng_condition_type) condition_comm->condition_type) {
 	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
-		create_from_buffer = lttng_condition_buffer_usage_low_create_from_buffer;
+		create_from_payload = lttng_condition_buffer_usage_low_create_from_payload;
 		break;
 	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
-		create_from_buffer = lttng_condition_buffer_usage_high_create_from_buffer;
+		create_from_payload = lttng_condition_buffer_usage_high_create_from_payload;
+		break;
+	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
+		create_from_payload = lttng_condition_session_consumed_size_create_from_payload;
+		break;
+	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
+		create_from_payload = lttng_condition_session_rotation_ongoing_create_from_payload;
+		break;
+	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
+		create_from_payload = lttng_condition_session_rotation_completed_create_from_payload;
 		break;
 	default:
 		ERR("Attempted to create condition of unknown type (%i)",
@@ -142,12 +146,12 @@ ssize_t lttng_condition_create_from_buffer(
 		goto end;
 	}
 
-	if (create_from_buffer) {
-		const struct lttng_buffer_view view =
-				lttng_buffer_view_from_view(buffer,
+	if (create_from_payload) {
+		struct lttng_payload_view condition_view =
+				lttng_payload_view_from_view(view,
 					sizeof(*condition_comm), -1);
 
-		ret = create_from_buffer(&view, condition);
+		ret = create_from_payload(&condition_view, condition);
 		if (ret < 0) {
 			goto end;
 		}