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

diff --git a/src/common/condition.c b/src/common/condition.c
index ceab81eab..6cebeb03f 100644
--- a/src/common/condition.c
+++ b/src/common/condition.c
@@ -17,6 +17,7 @@
 
 #include <lttng/condition/condition-internal.h>
 #include <lttng/condition/buffer-usage-internal.h>
+#include <lttng/condition/session-consumed-size-internal.h>
 #include <common/macros.h>
 #include <common/error.h>
 #include <common/dynamic-buffer.h>
@@ -62,31 +63,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_dynamic_buffer *buf)
 {
-	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 = { 0 };
 
 	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(buf, &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, buf);
+	if (ret) {
 		goto end;
 	}
-	ret += condition_size;
 end:
 	return ret;
 }
@@ -105,6 +104,11 @@ 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;
@@ -135,6 +139,9 @@ ssize_t lttng_condition_create_from_buffer(
 	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
 		create_from_buffer = lttng_condition_buffer_usage_high_create_from_buffer;
 		break;
+	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
+		create_from_buffer = lttng_condition_session_consumed_size_create_from_buffer;
+		break;
 	default:
 		ERR("Attempted to create condition of unknown type (%i)",
 				(int) condition_comm->condition_type);