X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=dc15829ba5c6488424327404922c665f4bc08f4f;hb=c0e2990d32d1e55c783c7eb3299f23a7ce062270;hp=d420fb4df005a6a2635b54ee1b6134f0dc3167f6;hpb=d891bb526224eeaf1cf688e072c7bf77321c6c2f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index d420fb4df..dc15829ba 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -485,6 +485,7 @@ error:
 enum lttng_error_code trace_kernel_create_event_notifier_rule(
 		struct lttng_trigger *trigger,
 		uint64_t token,
+		uint64_t error_counter_index,
 		struct ltt_kernel_event_notifier_rule **event_notifier_rule)
 {
 	enum lttng_error_code ret = LTTNG_OK;
@@ -497,7 +498,7 @@ enum lttng_error_code trace_kernel_create_event_notifier_rule(
 
 	assert(event_notifier_rule);
 
-	condition = lttng_trigger_get_condition(trigger);
+	condition = lttng_trigger_get_const_condition(trigger);
 	assert(condition);
 
 	condition_type = lttng_condition_get_type(condition);
@@ -522,6 +523,7 @@ enum lttng_error_code trace_kernel_create_event_notifier_rule(
 	local_kernel_token_event_rule->fd = -1;
 	local_kernel_token_event_rule->enabled = 1;
 	local_kernel_token_event_rule->token = token;
+	local_kernel_token_event_rule->error_counter_index = error_counter_index;
 
 	/* Get the reference of the event rule. */
 	lttng_trigger_get(trigger);
@@ -647,7 +649,8 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 			abort();
 		}
 
-		status = lttng_event_rule_userspace_probe_get_name(rule, &name);
+		status = lttng_event_rule_userspace_probe_get_event_name(
+				rule, &name);
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		ret_code = LTTNG_OK;
 		break;
@@ -687,7 +690,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		ret_code = LTTNG_OK;
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 	default:
 		abort();
 		break;
@@ -943,11 +946,11 @@ void trace_kernel_destroy_channel(struct ltt_kernel_channel *channel)
 	/* Remove from channel list */
 	cds_list_del(&channel->list);
 
-	if (notification_thread_handle
-			&& channel->published_to_notification_thread) {
+	if (the_notification_thread_handle &&
+			channel->published_to_notification_thread) {
 		status = notification_thread_command_remove_channel(
-				notification_thread_handle,
-				channel->key, LTTNG_DOMAIN_KERNEL);
+				the_notification_thread_handle, channel->key,
+				LTTNG_DOMAIN_KERNEL);
 		assert(status == LTTNG_OK);
 	}
 	free(channel->channel->attr.extended.ptr);