X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=5afd87734c3ba09d5729e9a482a16b9163bb1b3a;hb=881fc67f7002469477a5ad00e67a8077db6c0514;hp=988ba9d673be2dcf7eef95d0acfaf55e7a26c700;hpb=670a26e4165562ab2dc5a16b9941f942e4f30996;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 988ba9d67..5afd87734 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -436,7 +436,7 @@ int userspace_probe_add_callsite(
 	switch (type) {
 	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
 	{
-		struct lttng_kernel_event_callsite callsite;
+		struct lttng_kernel_abi_event_callsite callsite;
 		uint64_t offset;
 
 		ret = extract_userspace_probe_offset_function_elf(location,
@@ -460,7 +460,7 @@ int userspace_probe_add_callsite(
 		int i;
 		uint64_t *offsets = NULL;
 		uint32_t offsets_count;
-		struct lttng_kernel_event_callsite callsite;
+		struct lttng_kernel_abi_event_callsite callsite;
 
 		/*
 		 * This call allocates the offsets buffer. This buffer must be freed
@@ -1493,8 +1493,8 @@ error:
 /*
  * Get kernel version and validate it.
  */
-int kernel_validate_version(struct lttng_kernel_tracer_version *version,
-		struct lttng_kernel_tracer_abi_version *abi_version)
+int kernel_validate_version(struct lttng_kernel_abi_tracer_version *version,
+		struct lttng_kernel_abi_tracer_abi_version *abi_version)
 {
 	int ret;
 
@@ -1515,10 +1515,10 @@ int kernel_validate_version(struct lttng_kernel_tracer_version *version,
 		ERR("Failed to retrieve lttng-modules ABI version");
 		goto error;
 	}
-	if (abi_version->major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
+	if (abi_version->major != LTTNG_KERNEL_ABI_MAJOR_VERSION) {
 		ERR("Kernel tracer ABI version (%d.%d) does not match the expected ABI major version (%d.*)",
 			abi_version->major, abi_version->minor,
-			LTTNG_MODULES_ABI_MAJOR_VERSION);
+			LTTNG_KERNEL_ABI_MAJOR_VERSION);
 		goto error;
 	}
 	DBG2("Kernel tracer version validated (%d.%d, ABI %d.%d)",
@@ -1699,7 +1699,7 @@ enum lttng_error_code kernel_snapshot_record(
 	}
 
 	trace_path = setup_channel_trace_path(ksess->consumer,
-			DEFAULT_KERNEL_TRACE_DIR, &consumer_path_offset);
+			"", &consumer_path_offset);
 	if (!trace_path) {
 		status = LTTNG_ERR_INVALID;
 		goto error;
@@ -1782,7 +1782,7 @@ static
 int kernel_tracer_abi_greater_or_equal(unsigned int major, unsigned int minor)
 {
 	int ret;
-	struct lttng_kernel_tracer_abi_version abi;
+	struct lttng_kernel_abi_tracer_abi_version abi;
 
 	ret = kernctl_tracer_abi_version(kernel_tracer_fd, &abi);
 	if (ret < 0) {
@@ -2301,7 +2301,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	enum lttng_condition_type condition_type;
 	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 = {};
+	struct lttng_kernel_abi_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;
@@ -2313,10 +2313,10 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	assert(condition);
 
 	condition_type = lttng_condition_get_type(condition);
-	assert(condition_type == LTTNG_CONDITION_TYPE_ON_EVENT);
+	assert(condition_type == LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
 	/* Does not acquire a reference. */
-	condition_status = lttng_condition_on_event_get_rule(
+	condition_status = lttng_condition_event_rule_matches_get_rule(
 			condition, &event_rule);
 	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 	assert(event_rule);
@@ -2325,7 +2325,8 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	assert(event_rule_type != LTTNG_EVENT_RULE_TYPE_UNKNOWN);
 
 	error_code_ret = trace_kernel_create_event_notifier_rule(trigger, token,
-			lttng_condition_on_event_get_error_counter_index(condition),
+			lttng_condition_event_rule_matches_get_error_counter_index(
+					condition),
 			&event_notifier_rule);
 	if (error_code_ret != LTTNG_OK) {
 		goto error;
@@ -2339,7 +2340,8 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 
 	kernel_event_notifier.event.token = event_notifier_rule->token;
 	kernel_event_notifier.error_counter_idx =
-			lttng_condition_on_event_get_error_counter_index(condition);
+			lttng_condition_event_rule_matches_get_error_counter_index(
+					condition);
 
 	fd = kernctl_create_event_notifier(
 			kernel_tracer_event_notifier_group_fd,
@@ -2402,13 +2404,13 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	}
 
 	/* Set the capture bytecode if any. */
-	cond_status = lttng_condition_on_event_get_capture_descriptor_count(
+	cond_status = lttng_condition_event_rule_matches_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_on_event_get_capture_bytecode_at_index(
+				lttng_condition_event_rule_matches_get_capture_bytecode_at_index(
 						condition, i);
 
 		if (capture_bytecode == NULL) {
@@ -2486,7 +2488,7 @@ enum lttng_error_code kernel_register_event_notifier(
 	assert(condition);
 
 	/* Does not acquire a reference to the event rule. */
-	status = lttng_condition_on_event_get_rule(
+	status = lttng_condition_event_rule_matches_get_rule(
 			condition, &event_rule);
 	assert(status == LTTNG_CONDITION_STATUS_OK);