X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=cc93da881906fb459b4199e7625aef279928c8db;hp=0a156d8e7e1d024c218b03be6a6e81b29ed7979f;hb=152413a01067652b58ec4e682c598396af37a01c;hpb=178191b3899f114001f000c2e7f46909969f9c6f

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 0a156d8e7..cc93da881 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -59,7 +59,6 @@
 #include "ust-consumer.h"
 #include "utils.h"
 #include "fd-limit.h"
-#include "filter.h"
 #include "health.h"
 #include "testpoint.h"
 
@@ -634,7 +633,7 @@ static int update_kernel_stream(struct consumer_data *consumer_data, int fd)
 						assert(socket->fd >= 0);
 
 						pthread_mutex_lock(socket->lock);
-						ret = kernel_consumer_send_channel_stream(socket->fd,
+						ret = kernel_consumer_send_channel_stream(socket,
 								channel, ksess);
 						pthread_mutex_unlock(socket->lock);
 						if (ret < 0) {
@@ -1514,7 +1513,6 @@ error:
 		health_error(&health_thread_app_reg);
 		ERR("Health error occurred in %s", __func__);
 	}
-	health_exit(&health_thread_app_reg);
 
 	/* Notify that the registration thread is gone */
 	notify_ust_apps(0);
@@ -1539,6 +1537,7 @@ error_poll_add:
 error_listen:
 error_create_poll:
 	DBG("UST Registration thread cleanup complete");
+	health_exit(&health_thread_app_reg);
 
 	return NULL;
 }
@@ -2525,7 +2524,7 @@ skip_domain:
 	{
 		ret = cmd_enable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.enable.channel_name,
-				&cmd_ctx->lsm->u.enable.event, kernel_poll_pipe[1]);
+				&cmd_ctx->lsm->u.enable.event, NULL, kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_ENABLE_ALL_EVENT:
@@ -2534,7 +2533,7 @@ skip_domain:
 
 		ret = cmd_enable_event_all(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.enable.channel_name,
-				cmd_ctx->lsm->u.enable.event.type, kernel_poll_pipe[1]);
+				cmd_ctx->lsm->u.enable.event.type, NULL, kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_LIST_TRACEPOINTS:
@@ -2846,15 +2845,19 @@ skip_domain:
 				cmd_ctx->lsm->u.reg.path, cdata);
 		break;
 	}
-	case LTTNG_SET_FILTER:
+	case LTTNG_ENABLE_EVENT_WITH_FILTER:
 	{
 		struct lttng_filter_bytecode *bytecode;
 
-		if (cmd_ctx->lsm->u.filter.bytecode_len > LTTNG_FILTER_MAX_LEN) {
+		if (cmd_ctx->lsm->u.enable.bytecode_len > LTTNG_FILTER_MAX_LEN) {
 			ret = LTTNG_ERR_FILTER_INVAL;
 			goto error;
 		}
-		bytecode = zmalloc(cmd_ctx->lsm->u.filter.bytecode_len);
+		if (cmd_ctx->lsm->u.enable.bytecode_len == 0) {
+			ret = LTTNG_ERR_FILTER_INVAL;
+			goto error;
+		}
+		bytecode = zmalloc(cmd_ctx->lsm->u.enable.bytecode_len);
 		if (!bytecode) {
 			ret = LTTNG_ERR_FILTER_NOMEM;
 			goto error;
@@ -2862,7 +2865,7 @@ skip_domain:
 		/* Receive var. len. data */
 		DBG("Receiving var len data from client ...");
 		ret = lttcomm_recv_unix_sock(sock, bytecode,
-				cmd_ctx->lsm->u.filter.bytecode_len);
+				cmd_ctx->lsm->u.enable.bytecode_len);
 		if (ret <= 0) {
 			DBG("Nothing recv() from client var len data... continuing");
 			*sock_error = 1;
@@ -2871,16 +2874,15 @@ skip_domain:
 		}
 
 		if (bytecode->len + sizeof(*bytecode)
-				!= cmd_ctx->lsm->u.filter.bytecode_len) {
+				!= cmd_ctx->lsm->u.enable.bytecode_len) {
 			free(bytecode);
 			ret = LTTNG_ERR_FILTER_INVAL;
 			goto error;
 		}
 
-		ret = cmd_set_filter(cmd_ctx->session, cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.filter.channel_name,
-				&cmd_ctx->lsm->u.filter.event,
-				bytecode);
+		ret = cmd_enable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
+				cmd_ctx->lsm->u.enable.channel_name,
+				&cmd_ctx->lsm->u.enable.event, bytecode, kernel_poll_pipe[1]);
 		break;
 	}
 	case LTTNG_DATA_PENDING: