X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=382902a901ee321e5f7ec6d01ce547fe91f7d156;hb=57739a6b3247c7ded74522906e214eff0d6dc14c;hp=a9e8e03c35225b131924cc998553a763ab2c1bd0;hpb=f27911615bc5907d61d8ea236da974090bd85d24;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index a9e8e03c3..382902a90 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -18,13 +18,13 @@
 #include <lttng/userspace-probe-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kprobe.h>
-#include <lttng/event-rule/kprobe-internal.h>
+#include <lttng/event-rule/kernel-probe.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
 #include <lttng/event-rule/syscall.h>
 #include <lttng/event-rule/syscall-internal.h>
 #include <lttng/event-rule/tracepoint.h>
 #include <lttng/event-rule/tracepoint-internal.h>
-#include <lttng/event-rule/uprobe-internal.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/trace-chunk.h>
@@ -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,13 +498,13 @@ 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);
-	assert(condition_type == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
+	assert(condition_type == LTTNG_CONDITION_TYPE_ON_EVENT);
 
-	condition_status = lttng_condition_event_rule_get_rule(
+	condition_status = lttng_condition_on_event_get_rule(
 			condition, &event_rule);
 	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 	assert(event_rule);
@@ -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);
@@ -601,18 +603,18 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 
 		kernel_event_notifier->event.u.kprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 
-		status = lttng_event_rule_kernel_probe_get_name(rule, &name);
+		status = lttng_event_rule_kernel_probe_get_event_name(rule, &name);
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		ret_code = LTTNG_OK;
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_UPROBE:
+	case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
 	{
 		const struct lttng_userspace_probe_location* location = NULL;
 		const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
 		enum lttng_event_rule_status status;
 
-		status = lttng_event_rule_uprobe_get_location(rule, &location);
+		status = lttng_event_rule_userspace_probe_get_location(rule, &location);
 		if (status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
 			goto error;
@@ -647,7 +649,8 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 			abort();
 		}
 
-		status = lttng_event_rule_uprobe_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;
@@ -673,21 +676,41 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		const enum lttng_event_rule_status status =
 				lttng_event_rule_syscall_get_pattern(
 						rule, &name);
+		const enum lttng_event_rule_syscall_emission_site_type
+			emission_site_type =
+			lttng_event_rule_syscall_get_emission_site_type(rule);
+		enum lttng_kernel_syscall_entryexit entryexit;
 
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
+		assert(emission_site_type != LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_UNKNOWN);
+
+		switch(emission_site_type) {
+		case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY:
+			entryexit = LTTNG_KERNEL_SYSCALL_ENTRY;
+			break;
+		case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_EXIT:
+			entryexit = LTTNG_KERNEL_SYSCALL_EXIT;
+			break;
+		case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT:
+			entryexit = LTTNG_KERNEL_SYSCALL_ENTRYEXIT;
+			break;
+		default:
+			abort();
+			break;
+		}
 
 		kernel_event_notifier->event.instrumentation =
 				LTTNG_KERNEL_SYSCALL;
 		kernel_event_notifier->event.u.syscall.abi =
 				LTTNG_KERNEL_SYSCALL_ABI_ALL;
 		kernel_event_notifier->event.u.syscall.entryexit =
-				LTTNG_KERNEL_SYSCALL_ENTRY;
+				entryexit;
 		kernel_event_notifier->event.u.syscall.match =
 				LTTNG_KERNEL_SYSCALL_MATCH_NAME;
 		ret_code = LTTNG_OK;
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 	default:
 		abort();
 		break;
@@ -943,11 +966,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);