X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnotification.c;h=d1403574b1c2401a4941ae0fe389eaac7bbfcdcf;hb=48a4000561343808724f7cb5fa8c131877489ccd;hp=2544d042fd8192ee309558df6b41e483dc4db3ca;hpb=9e620ea7b016fc3fd4e08b5d094ffa40b36b50f6;p=lttng-tools.git

diff --git a/src/common/notification.c b/src/common/notification.c
index 2544d042f..d1403574b 100644
--- a/src/common/notification.c
+++ b/src/common/notification.c
@@ -10,18 +10,17 @@
 #include <lttng/condition/evaluation-internal.h>
 #include <lttng/condition/condition.h>
 #include <lttng/condition/evaluation.h>
+#include <lttng/trigger/trigger-internal.h>
 #include <common/payload.h>
 #include <common/payload-view.h>
-#include <assert.h>
 
-LTTNG_HIDDEN
 struct lttng_notification *lttng_notification_create(
-		struct lttng_condition *condition,
+		struct lttng_trigger *trigger,
 		struct lttng_evaluation *evaluation)
 {
 	struct lttng_notification *notification = NULL;
 
-	if (!condition || !evaluation) {
+	if (!trigger || !evaluation) {
 		goto end;
 	}
 
@@ -30,13 +29,12 @@ struct lttng_notification *lttng_notification_create(
 		goto end;
 	}
 
-	notification->condition = condition;
+	notification->trigger = trigger;
 	notification->evaluation = evaluation;
 end:
 	return notification;
 }
 
-LTTNG_HIDDEN
 int lttng_notification_serialize(const struct lttng_notification *notification,
 		struct lttng_payload *payload)
 {
@@ -53,7 +51,7 @@ int lttng_notification_serialize(const struct lttng_notification *notification,
 	}
 
 	size_before_payload = payload->buffer.size;
-	ret = lttng_condition_serialize(notification->condition,
+	ret = lttng_trigger_serialize(notification->trigger,
 			payload);
 	if (ret) {
 		goto end;
@@ -72,22 +70,30 @@ end:
 
 }
 
-LTTNG_HIDDEN
 ssize_t lttng_notification_create_from_payload(
 		struct lttng_payload_view *src_view,
 		struct lttng_notification **notification)
 {
-	ssize_t ret, notification_size = 0, condition_size, evaluation_size;
+	ssize_t ret, notification_size = 0, trigger_size, evaluation_size;
+	struct lttng_trigger *trigger = NULL;
+	struct lttng_evaluation *evaluation = NULL;
 	const struct lttng_notification_comm *notification_comm;
-	struct lttng_condition *condition;
-	struct lttng_evaluation *evaluation;
+	const struct lttng_payload_view notification_comm_view =
+			lttng_payload_view_from_view(
+					src_view, 0, sizeof(*notification_comm));
 
 	if (!src_view || !notification) {
 		ret = -1;
-		goto end;
+		goto error;
 	}
 
-	notification_comm = (typeof(notification_comm)) src_view->buffer.data;
+	if (!lttng_payload_view_is_valid(&notification_comm_view)) {
+		/* Payload not large enough to contain the header. */
+		ret = -1;
+		goto error;
+	}
+
+	notification_comm = (typeof(notification_comm)) notification_comm_view.buffer.data;
 	notification_size += sizeof(*notification_comm);
 	{
 		/* struct lttng_condition */
@@ -95,16 +101,16 @@ ssize_t lttng_notification_create_from_payload(
 				lttng_payload_view_from_view(src_view,
 						notification_size, -1);
 
-		condition_size = lttng_condition_create_from_payload(
-				&condition_view, &condition);
+		trigger_size = lttng_trigger_create_from_payload(
+				&condition_view, &trigger);
 	}
 
-	if (condition_size < 0) {
-		ret = condition_size;
-		goto end;
+	if (trigger_size < 0) {
+		ret = trigger_size;
+		goto error;
 	}
 
-	notification_size += condition_size;
+	notification_size += trigger_size;
 
 	{
 		/* struct lttng_evaluation */
@@ -113,33 +119,35 @@ ssize_t lttng_notification_create_from_payload(
 						notification_size, -1);
 
 		evaluation_size = lttng_evaluation_create_from_payload(
+				lttng_trigger_get_const_condition(trigger),
 				&evaluation_view, &evaluation);
 	}
 
 	if (evaluation_size < 0) {
 		ret = evaluation_size;
-		goto end;
+		goto error;
 	}
 
 	notification_size += evaluation_size;
 
 	/* Unexpected size of inner-elements; the buffer is corrupted. */
 	if ((ssize_t) notification_comm->length !=
-			condition_size + evaluation_size) {
+			trigger_size + evaluation_size) {
 		ret = -1;
 		goto error;
 	}
 
-	*notification = lttng_notification_create(condition, evaluation);
+	*notification = lttng_notification_create(trigger, evaluation);
 	if (!*notification) {
 		ret = -1;
 		goto error;
 	}
+
 	ret = notification_size;
-end:
 	return ret;
+
 error:
-	lttng_condition_destroy(condition);
+	lttng_trigger_destroy(trigger);
 	lttng_evaluation_destroy(evaluation);
 	return ret;
 }
@@ -150,7 +158,7 @@ void lttng_notification_destroy(struct lttng_notification *notification)
 		return;
 	}
 
-	lttng_condition_destroy(notification->condition);
+	lttng_trigger_destroy(notification->trigger);
 	lttng_evaluation_destroy(notification->evaluation);
 	free(notification);
 }
@@ -158,7 +166,7 @@ void lttng_notification_destroy(struct lttng_notification *notification)
 const struct lttng_condition *lttng_notification_get_condition(
 		struct lttng_notification *notification)
 {
-	return notification ? notification->condition : NULL;
+	return notification ? lttng_trigger_get_const_condition(notification->trigger) : NULL;
 }
 
 const struct lttng_evaluation *lttng_notification_get_evaluation(
@@ -166,3 +174,9 @@ const struct lttng_evaluation *lttng_notification_get_evaluation(
 {
 	return notification ? notification->evaluation : NULL;
 }
+
+const struct lttng_trigger *lttng_notification_get_trigger(
+		struct lttng_notification *notification)
+{
+	return notification ? notification->trigger : NULL;
+}