From a3c516531ffff69b8d5f6564c8e4d00b4f18e7da Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 4 Nov 2020 15:45:31 -0500
Subject: [PATCH] Rename kprobe file to kernel-probe
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I379bd8d88b4fa4a7d5638dc5bee4d7dd86426dc9
---
 include/Makefile.am                                           | 4 ++--
 .../event-rule/{kprobe-internal.h => kernel-probe-internal.h} | 2 +-
 include/lttng/event-rule/{kprobe.h => kernel-probe.h}         | 0
 include/lttng/lttng.h                                         | 2 +-
 src/bin/lttng-sessiond/trace-kernel.c                         | 4 ++--
 src/common/Makefile.am                                        | 2 +-
 src/common/event-rule/event-rule.c                            | 2 +-
 src/common/event-rule/{kprobe.c => kernel-probe.c}            | 2 +-
 tests/unit/test_event_rule.c                                  | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename include/lttng/event-rule/{kprobe-internal.h => kernel-probe-internal.h} (95%)
 rename include/lttng/event-rule/{kprobe.h => kernel-probe.h} (100%)
 rename src/common/event-rule/{kprobe.c => kernel-probe.c} (99%)

diff --git a/include/Makefile.am b/include/Makefile.am
index b75602b27..dc09f385f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -148,7 +148,7 @@ lttngtriggerinclude_HEADERS= \
 
 lttngeventruleinclude_HEADERS= \
 	lttng/event-rule/event-rule.h \
-	lttng/event-rule/kprobe.h \
+	lttng/event-rule/kernel-probe.h \
 	lttng/event-rule/syscall.h \
 	lttng/event-rule/uprobe.h \
 	lttng/event-rule/tracepoint.h
@@ -188,7 +188,7 @@ noinst_HEADERS = \
 	lttng/session-descriptor-internal.h \
 	lttng/kernel-probe-internal.h \
 	lttng/event-rule/event-rule-internal.h \
-	lttng/event-rule/kprobe-internal.h \
+	lttng/event-rule/kernel-probe-internal.h \
 	lttng/event-rule/syscall-internal.h \
 	lttng/event-rule/uprobe-internal.h \
 	lttng/event-rule/tracepoint-internal.h \
diff --git a/include/lttng/event-rule/kprobe-internal.h b/include/lttng/event-rule/kernel-probe-internal.h
similarity index 95%
rename from include/lttng/event-rule/kprobe-internal.h
rename to include/lttng/event-rule/kernel-probe-internal.h
index 3799af955..50c02d851 100644
--- a/include/lttng/event-rule/kprobe-internal.h
+++ b/include/lttng/event-rule/kernel-probe-internal.h
@@ -11,7 +11,7 @@
 #include <common/payload-view.h>
 #include <common/macros.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kprobe.h>
+#include <lttng/event-rule/kernel-probe.h>
 
 struct lttng_event_rule_kernel_probe {
 	struct lttng_event_rule parent;
diff --git a/include/lttng/event-rule/kprobe.h b/include/lttng/event-rule/kernel-probe.h
similarity index 100%
rename from include/lttng/event-rule/kprobe.h
rename to include/lttng/event-rule/kernel-probe.h
diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index c665d3c9b..bc5a83d48 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -40,7 +40,7 @@
 #include <lttng/event-expr.h>
 #include <lttng/event-field-value.h>
 #include <lttng/event-rule/event-rule.h>
-#include <lttng/event-rule/kprobe.h>
+#include <lttng/event-rule/kernel-probe.h>
 #include <lttng/event-rule/syscall.h>
 #include <lttng/event-rule/tracepoint.h>
 #include <lttng/event-rule/uprobe.h>
diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index a9e8e03c3..72de7eadd 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -18,8 +18,8 @@
 #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>
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 4b549aa08..3c076c8ff 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -62,7 +62,7 @@ libcommon_la_SOURCES = \
 	event-expr-to-bytecode.c event-expr-to-bytecode.h \
 	event-field-value.c \
 	event-rule/event-rule.c \
-	event-rule/kprobe.c \
+	event-rule/kernel-probe.c \
 	event-rule/syscall.c \
 	event-rule/uprobe.c \
 	event-rule/tracepoint.c \
diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index c6ccc8577..88b9d5bc5 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,7 +14,7 @@
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kprobe-internal.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
 #include <lttng/event-rule/syscall-internal.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/event-rule/uprobe-internal.h>
diff --git a/src/common/event-rule/kprobe.c b/src/common/event-rule/kernel-probe.c
similarity index 99%
rename from src/common/event-rule/kprobe.c
rename to src/common/event-rule/kernel-probe.c
index 37592962b..6152a1b50 100644
--- a/src/common/event-rule/kprobe.c
+++ b/src/common/event-rule/kernel-probe.c
@@ -17,7 +17,7 @@
 #include <ctype.h>
 #include <lttng/constant.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/kprobe-internal.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
 #include <lttng/kernel-probe.h>
 #include <lttng/kernel-probe-internal.h>
 #include <stdio.h>
diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 7ed1a8bbf..0e83850a7 100644
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -18,8 +18,8 @@
 #include <common/payload-view.h>
 #include <common/payload.h>
 #include <lttng/domain.h>
-#include <lttng/event-rule/kprobe-internal.h>
-#include <lttng/event-rule/kprobe.h>
+#include <lttng/event-rule/kernel-probe-internal.h>
+#include <lttng/event-rule/kernel-probe.h>
 #include <lttng/event-rule/syscall-internal.h>
 #include <lttng/event-rule/syscall.h>
 #include <lttng/event-rule/tracepoint-internal.h>
-- 
2.34.1