From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 18 May 2021 18:57:05 +0000 (-0400)
Subject: Remove LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION
X-Git-Tag: v2.13.0-rc3~69
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1b8894d079813c9e8a29e2da64f6427e62514a0e;p=lttng-tools.git

Remove LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION

It is not supported for 2.13.

Change-Id: If42b18115cc61da9ee17f281390280b21fdc35a6
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/include/lttng/event-rule/event-rule.h b/include/lttng/event-rule/event-rule.h
index 0aac04c84..a6dbb01a0 100644
--- a/include/lttng/event-rule/event-rule.h
+++ b/include/lttng/event-rule/event-rule.h
@@ -18,13 +18,12 @@ enum lttng_event_rule_type {
 	LTTNG_EVENT_RULE_TYPE_UNKNOWN = -1,
 	LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL = 0,
 	LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE = 1,
-	LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION = 2,
-	LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT = 3,
-	LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE = 4,
-	LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT = 5,
-	LTTNG_EVENT_RULE_TYPE_JUL_LOGGING = 6,
-	LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING = 7,
-	LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING = 8,
+	LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT = 2,
+	LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE = 3,
+	LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT = 4,
+	LTTNG_EVENT_RULE_TYPE_JUL_LOGGING = 5,
+	LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING = 6,
+	LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING = 7,
 };
 
 enum lttng_event_rule_status {
diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index bd06ba4ec..29a60cef5 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -708,7 +708,6 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
 		ret_code = LTTNG_OK;
 		break;
 	}
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 	default:
 		abort();
 		break;
diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 863e8fe1d..5b41ad053 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -130,8 +130,6 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg)
 		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE;
 	} else if (strcmp(arg, "kernel:uprobe") == 0) {
 		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE;
-	} else if (strcmp(arg, "function") == 0) {
-		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION;
 	} else if (has_syscall_prefix(arg)) {
 		/*
 		 * Matches the following:
@@ -878,7 +876,6 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 	switch (event_rule_type) {
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 		if (!location) {
 			ERR("Event rule of type %s requires a --location.",
 			lttng_event_rule_type_str(event_rule_type));
diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index e02a1c320..b4225f867 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -51,7 +51,6 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 		break;
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
 		domain_type = LTTNG_DOMAIN_KERNEL;
@@ -181,9 +180,6 @@ ssize_t lttng_event_rule_create_from_payload(
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 		create_from_payload = lttng_event_rule_kernel_kprobe_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-		/* TODO */
-		break;
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 		create_from_payload = lttng_event_rule_kernel_uprobe_create_from_payload;
 		break;
@@ -341,8 +337,6 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 		return "kernel syscall";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 		return "kernel kprobe";
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-		return "function";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 		return "kernel uprobe";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT: