X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=11e2885411f69f6fb07325d0364aed8c891e37d1;hp=7eea28121e3e55394c67fc96ad484d4574b5f4da;hb=7c1d2758d663ac5f119eae6849e50b56546a0c48;hpb=d0ae4ea864f84fa2456563abb20fe42e5cc29625

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 7eea28121..11e288541 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -38,6 +38,7 @@
 #include "lttng-sessiond.h"
 #include "utils.h"
 #include "syscall.h"
+#include "agent.h"
 
 #include "cmd.h"
 
@@ -1485,18 +1486,51 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		switch (event->type) {
 		case LTTNG_EVENT_ALL:
 		{
+			char *filter_expression_a = NULL;
+			struct lttng_filter_bytecode *filter_a = NULL;
+
+			/*
+			 * We need to duplicate filter_expression and filter,
+			 * because ownership is passed to first enable
+			 * event.
+			 */
+			if (filter_expression) {
+				filter_expression_a = strdup(filter_expression);
+				if (!filter_expression_a) {
+					ret = LTTNG_ERR_FATAL;
+					goto error;
+				}
+			}
+			if (filter) {
+				filter_a = zmalloc(sizeof(*filter_a) + filter->len);
+				if (!filter_a) {
+					free(filter_expression_a);
+					ret = LTTNG_ERR_FATAL;
+					goto error;
+				}
+				memcpy(filter_a, filter, sizeof(*filter_a) + filter->len);
+			}
 			event->type = LTTNG_EVENT_TRACEPOINT;	/* Hack */
-			ret = event_kernel_enable_event(kchan, event);
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression, filter);
+			/* We have passed ownership */
+			filter_expression = NULL;
+			filter = NULL;
 			if (ret != LTTNG_OK) {
 				if (channel_created) {
 					/* Let's not leak a useless channel. */
 					kernel_destroy_channel(kchan);
 				}
+				free(filter_expression_a);
+				free(filter_a);
 				goto error;
 			}
 			event->type = LTTNG_EVENT_SYSCALL;	/* Hack */
-			ret = event_kernel_enable_event(kchan, event);
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression_a, filter_a);
 			if (ret != LTTNG_OK) {
+				free(filter_expression_a);
+				free(filter_a);
 				goto error;
 			}
 			break;
@@ -1505,7 +1539,11 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		case LTTNG_EVENT_FUNCTION:
 		case LTTNG_EVENT_FUNCTION_ENTRY:
 		case LTTNG_EVENT_TRACEPOINT:
-			ret = event_kernel_enable_event(kchan, event);
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression, filter);
+			/* We have passed ownership */
+			filter_expression = NULL;
+			filter = NULL;
 			if (ret != LTTNG_OK) {
 				if (channel_created) {
 					/* Let's not leak a useless channel. */
@@ -1515,7 +1553,11 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 			}
 			break;
 		case LTTNG_EVENT_SYSCALL:
-			ret = event_kernel_enable_event(kchan, event);
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression, filter);
+			/* We have passed ownership */
+			filter_expression = NULL;
+			filter = NULL;
 			if (ret != LTTNG_OK) {
 				goto error;
 			}