X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcondition.c;h=60d32e6cc7816c461dd0f9a0bdee6340e3ea1e45;hp=ceab81eabbd81a6928a9b6122a6fdb117940a4b8;hb=e8360425c2fd0f8cfef1e678af5adfde7ae0a68e;hpb=d184b96cb8d5bd26fcef718acc447eb55f10ed08

diff --git a/src/common/condition.c b/src/common/condition.c
index ceab81eab..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>
@@ -67,7 +68,8 @@ ssize_t lttng_condition_serialize(const struct lttng_condition *condition,
 {
 	ssize_t ret, condition_size;
 	struct lttng_condition_comm condition_comm = {
-		.condition_type = (int8_t) condition->type
+		.condition_type = (int8_t) (condition ?
+				condition->type : LTTNG_CONDITION_TYPE_UNKNOWN)
 	};
 
 	if (!condition) {
@@ -135,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);