X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-kernel.c;h=a453fd8b705537ba8908e729517c20b408ef2951;hp=7dde1b51d0cef1862f36b1fc4d3afb6e6bce9144;hb=7c1f6da21f4d46d9c834820a2b26f0634c7365a9;hpb=366a83b3757c2adb764f2fab95247d5c0d1cf668

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 7dde1b51d..a453fd8b7 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>
@@ -71,7 +71,7 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
 struct ltt_kernel_event *trace_kernel_find_event(
 		char *name, struct ltt_kernel_channel *channel,
 		enum lttng_event_type type,
-		struct lttng_filter_bytecode *filter)
+		struct lttng_bytecode *filter)
 {
 	struct ltt_kernel_event *ev;
 	int found = 0;
@@ -330,7 +330,7 @@ error:
  */
 enum lttng_error_code trace_kernel_create_event(
 		struct lttng_event *ev, char *filter_expression,
-		struct lttng_filter_bytecode *filter,
+		struct lttng_bytecode *filter,
 		struct ltt_kernel_event **kernel_event)
 {
 	enum lttng_error_code ret;
@@ -497,13 +497,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);
@@ -550,7 +550,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 	int strncpy_ret;
 
 	switch (lttng_event_rule_get_type(rule)) {
-	case LTTNG_EVENT_RULE_TYPE_KPROBE:
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
 	{
 		uint64_t address = 0, offset = 0;
 		const char *symbol_name = NULL;
@@ -558,7 +558,7 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		enum lttng_kernel_probe_location_status k_status;
 		enum lttng_event_rule_status status;
 
-		status = lttng_event_rule_kprobe_get_location(rule, &location);
+		status = lttng_event_rule_kernel_probe_get_location(rule, &location);
 		if (status != LTTNG_EVENT_RULE_STATUS_OK) {
 			ret_code = LTTNG_ERR_PROBE_LOCATION_INVAL;
 			goto error;
@@ -600,18 +600,19 @@ 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_kprobe_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;
@@ -646,7 +647,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;
@@ -686,7 +688,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;