X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevaluation.c;h=b76d349fa40526225d9b7199a0d919955a1d8bfb;hp=b2c2df81585e34d943af6605d04d8633b084a277;hb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;hpb=e8360425c2fd0f8cfef1e678af5adfde7ae0a68e

diff --git a/src/common/evaluation.c b/src/common/evaluation.c
index b2c2df815..b76d349fa 100644
--- a/src/common/evaluation.c
+++ b/src/common/evaluation.c
@@ -1,78 +1,81 @@
 /*
- * 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/evaluation-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 <stdbool.h>
 #include <assert.h>
 
 LTTNG_HIDDEN
-ssize_t lttng_evaluation_serialize(struct lttng_evaluation *evaluation,
-		char *buf)
+void lttng_evaluation_init(struct lttng_evaluation *evaluation,
+		enum lttng_condition_type type)
 {
-	ssize_t ret, offset = 0;
+	evaluation->type = type;
+}
+
+LTTNG_HIDDEN
+int lttng_evaluation_serialize(const struct lttng_evaluation *evaluation,
+		struct lttng_payload *payload)
+{
+	int ret;
 	struct lttng_evaluation_comm evaluation_comm = {
 		.type = (int8_t) evaluation->type
 	};
 
-	if (buf) {
-		memcpy(buf, &evaluation_comm, sizeof(evaluation_comm));
+	ret = lttng_dynamic_buffer_append(&payload->buffer, &evaluation_comm,
+			sizeof(evaluation_comm));
+	if (ret) {
+		goto end;
 	}
-	offset += sizeof(evaluation_comm);
 
 	if (evaluation->serialize) {
-		ret = evaluation->serialize(evaluation,
-				buf ? (buf + offset) : NULL);
-		if (ret < 0) {
+		ret = evaluation->serialize(evaluation, payload);
+		if (ret) {
 			goto end;
 		}
-		offset += ret;
 	}
-
-	ret = offset;
 end:
 	return ret;
 }
 
 LTTNG_HIDDEN
-ssize_t lttng_evaluation_create_from_buffer(
-		const struct lttng_buffer_view *src_view,
+ssize_t lttng_evaluation_create_from_payload(
+		struct lttng_payload_view *src_view,
 		struct lttng_evaluation **evaluation)
 {
 	ssize_t ret, evaluation_size = 0;
 	const struct lttng_evaluation_comm *evaluation_comm;
-	const struct lttng_buffer_view evaluation_view =
-			lttng_buffer_view_from_view(src_view,
-			sizeof(*evaluation_comm), -1);
+	struct lttng_payload_view evaluation_comm_view =
+			lttng_payload_view_from_view(
+					src_view, 0, sizeof(*evaluation_comm));
+	struct lttng_payload_view evaluation_view =
+			lttng_payload_view_from_view(src_view,
+					sizeof(*evaluation_comm), -1);
 
 	if (!src_view || !evaluation) {
 		ret = -1;
 		goto end;
 	}
 
-	evaluation_comm = (const struct lttng_evaluation_comm *) src_view->data;
+	if (!lttng_payload_view_is_valid(&evaluation_comm_view)) {
+		ret = -1;
+		goto end;
+	}
+
+	evaluation_comm = (typeof(evaluation_comm)) evaluation_comm_view.buffer.data;
 	evaluation_size += sizeof(*evaluation_comm);
 
 	switch ((enum lttng_condition_type) evaluation_comm->type) {
 	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
-		ret = lttng_evaluation_buffer_usage_low_create_from_buffer(
+		ret = lttng_evaluation_buffer_usage_low_create_from_payload(
 				&evaluation_view, evaluation);
 		if (ret < 0) {
 			goto end;
@@ -80,7 +83,7 @@ ssize_t lttng_evaluation_create_from_buffer(
 		evaluation_size += ret;
 		break;
 	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
-		ret = lttng_evaluation_buffer_usage_high_create_from_buffer(
+		ret = lttng_evaluation_buffer_usage_high_create_from_payload(
 				&evaluation_view, evaluation);
 		if (ret < 0) {
 			goto end;
@@ -88,7 +91,23 @@ ssize_t lttng_evaluation_create_from_buffer(
 		evaluation_size += ret;
 		break;
 	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
-		ret = lttng_evaluation_session_consumed_size_create_from_buffer(
+		ret = lttng_evaluation_session_consumed_size_create_from_payload(
+				&evaluation_view, evaluation);
+		if (ret < 0) {
+			goto end;
+		}
+		evaluation_size += ret;
+		break;
+	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
+		ret = lttng_evaluation_session_rotation_ongoing_create_from_payload(
+				&evaluation_view, evaluation);
+		if (ret < 0) {
+			goto end;
+		}
+		evaluation_size += ret;
+		break;
+	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
+		ret = lttng_evaluation_session_rotation_completed_create_from_payload(
 				&evaluation_view, evaluation);
 		if (ret < 0) {
 			goto end;
@@ -101,6 +120,7 @@ ssize_t lttng_evaluation_create_from_buffer(
 		ret = -1;
 		goto end;
 	}
+
 	ret = evaluation_size;
 end:
 	return ret;