X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=54e745474d89c8c891bc78f8a35b8ce742f53cd0;hp=4bb8045e7ca9e68f078a69cfaa6e2e095b40c911;hb=bbd6675c857ad9bf95e59446476cab19d1f6736e;hpb=352b58f55f53e7d11fb286ddc26a3bd0ecdd02f5

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 4bb8045e7..54e745474 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -568,7 +568,7 @@ end:
 int kernel_create_event(struct lttng_event *ev,
 		struct ltt_kernel_channel *channel,
 		char *filter_expression,
-		struct lttng_filter_bytecode *filter)
+		struct lttng_bytecode *filter)
 {
 	int err, fd;
 	enum lttng_error_code ret;
@@ -2065,20 +2065,9 @@ error:
 LTTNG_HIDDEN
 void cleanup_kernel_tracer(void)
 {
-	int ret;
-	struct cds_lfht_iter iter;
-	struct ltt_kernel_event_notifier_rule *rule = NULL;
-
-	rcu_read_lock();
-	cds_lfht_for_each_entry(kernel_token_to_event_notifier_rule_ht, &iter, rule, ht_node) {
-		kernel_disable_event_notifier_rule(rule);
-		trace_kernel_destroy_event_notifier_rule(rule);
-	}
-	rcu_read_unlock();
-
 	DBG2("Closing kernel event notifier group notification file descriptor");
 	if (kernel_tracer_event_notifier_group_notification_fd >= 0) {
-		ret = notification_thread_command_remove_tracer_event_source(
+		int ret = notification_thread_command_remove_tracer_event_source(
 				notification_thread_handle,
 				kernel_tracer_event_notifier_group_notification_fd);
 		if (ret != LTTNG_OK) {
@@ -2095,13 +2084,15 @@ void cleanup_kernel_tracer(void)
 	}
 
 	if (kernel_token_to_event_notifier_rule_ht) {
-		ret = cds_lfht_destroy(kernel_token_to_event_notifier_rule_ht, NULL);
+		const int ret = cds_lfht_destroy(
+				kernel_token_to_event_notifier_rule_ht, NULL);
 		assert(ret == 0);
 	}
 
 	DBG2("Closing kernel event notifier group file descriptor");
 	if (kernel_tracer_event_notifier_group_fd >= 0) {
-		ret = close(kernel_tracer_event_notifier_group_fd);
+		const int ret = close(kernel_tracer_event_notifier_group_fd);
+
 		if (ret) {
 			PERROR("Failed to close kernel event notifier group file descriptor: fd = %d",
 					kernel_tracer_event_notifier_group_fd);
@@ -2112,7 +2103,8 @@ void cleanup_kernel_tracer(void)
 
 	DBG2("Closing kernel fd");
 	if (kernel_tracer_fd >= 0) {
-		ret = close(kernel_tracer_fd);
+		const int ret = close(kernel_tracer_fd);
+
 		if (ret) {
 			PERROR("Failed to close kernel tracer file descriptor: fd = %d",
 					kernel_tracer_fd);
@@ -2307,8 +2299,10 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	enum lttng_event_rule_type event_rule_type;
 	struct ltt_kernel_event_notifier_rule *event_notifier_rule;
 	struct lttng_kernel_event_notifier kernel_event_notifier = {};
+	unsigned int capture_bytecode_count = 0, i;
 	const struct lttng_condition *condition = NULL;
 	const struct lttng_event_rule *event_rule = NULL;
+	enum lttng_condition_status cond_status;
 
 	assert(trigger);
 
@@ -2336,7 +2330,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	error_code_ret = trace_kernel_init_event_notifier_from_event_rule(
 			event_rule, &kernel_event_notifier);
 	if (error_code_ret != LTTNG_OK) {
-		goto error;
+		goto free_event;
 	}
 
 	kernel_event_notifier.event.token = event_notifier_rule->token;
@@ -2401,6 +2395,31 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 		}
 	}
 
+	/* Set the capture bytecode, if any. */
+	cond_status = lttng_condition_event_rule_get_capture_descriptor_count(
+			condition, &capture_bytecode_count);
+	assert(cond_status == LTTNG_CONDITION_STATUS_OK);
+
+	for (i = 0; i < capture_bytecode_count; i++) {
+		const struct lttng_bytecode *capture_bytecode =
+				lttng_condition_event_rule_get_capture_bytecode_at_index(
+						condition, i);
+
+		if (capture_bytecode == NULL) {
+			ERR("Unexpected NULL capture bytecode on condition");
+			error_code_ret = LTTNG_ERR_KERN_ENABLE_FAIL;
+			goto error;
+		}
+
+		ret = kernctl_capture(event_notifier_rule->fd, capture_bytecode);
+		if (ret < 0) {
+			ERR("Failed to set capture bytecode on event notifier rule fd: fd = %d",
+					event_notifier_rule->fd);
+			error_code_ret = LTTNG_ERR_KERN_ENABLE_FAIL;
+			goto error;
+		}
+	}
+
 	err = kernctl_enable(event_notifier_rule->fd);
 	if (err < 0) {
 		switch (-err) {
@@ -2469,7 +2488,7 @@ enum lttng_error_code kernel_register_event_notifier(
 
 	ret = kernel_create_event_notifier_rule(trigger, cmd_creds, token);
 	if (ret != LTTNG_OK) {
-		ERR("Failed to create kernel trigger");
+		ERR("Failed to create kernel event notifier rule");
 	}
 
 	return ret;