X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcondition.c;h=60d32e6cc7816c461dd0f9a0bdee6340e3ea1e45;hb=97056403bdb7c18abe9c1e8e0824e3a64123c4c2;hp=0b184422a69bf0b3f3b36f877d0522b1ce8d8ee7;hpb=a58c490f0bff52a73717d31d04d1472629180de2;p=lttng-tools.git

diff --git a/src/common/condition.c b/src/common/condition.c
index 0b184422a..60d32e6cc 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>
@@ -66,14 +67,16 @@ ssize_t lttng_condition_serialize(const struct lttng_condition *condition,
 		char *buf)
 {
 	ssize_t ret, condition_size;
-	struct lttng_condition_comm condition_comm;
+	struct lttng_condition_comm condition_comm = {
+		.condition_type = (int8_t) (condition ?
+				condition->type : LTTNG_CONDITION_TYPE_UNKNOWN)
+	};
 
 	if (!condition) {
 		ret = -1;
 		goto end;
 	}
 
-	condition_comm.condition_type = (int8_t) condition->type;
 	ret = sizeof(struct lttng_condition_comm);
 	if (buf) {
 		memcpy(buf, &condition_comm, ret);
@@ -134,6 +137,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);