From e957bf98e634c79b13281d0a2fe144be0245d310 Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 4 Nov 2020 19:18:17 -0500
Subject: [PATCH] Rename uprobe files to userspace-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: Ide5aeca0d56b8a368fa26bf7cc082098e349d8d9
---
 include/Makefile.am                                           | 4 ++--
 .../{uprobe-internal.h => userspace-probe-internal.h}         | 2 +-
 include/lttng/event-rule/{uprobe.h => userspace-probe.h}      | 0
 include/lttng/lttng.h                                         | 2 +-
 src/bin/lttng-sessiond/kernel.c                               | 2 +-
 src/bin/lttng-sessiond/trace-kernel.c                         | 2 +-
 src/common/Makefile.am                                        | 2 +-
 src/common/event-rule/event-rule.c                            | 2 +-
 src/common/event-rule/{uprobe.c => userspace-probe.c}         | 2 +-
 tests/unit/test_event_rule.c                                  | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)
 rename include/lttng/event-rule/{uprobe-internal.h => userspace-probe-internal.h} (96%)
 rename include/lttng/event-rule/{uprobe.h => userspace-probe.h} (100%)
 rename src/common/event-rule/{uprobe.c => userspace-probe.c} (99%)

diff --git a/include/Makefile.am b/include/Makefile.am
index dc09f385f..8dae80973 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -150,7 +150,7 @@ lttngeventruleinclude_HEADERS= \
 	lttng/event-rule/event-rule.h \
 	lttng/event-rule/kernel-probe.h \
 	lttng/event-rule/syscall.h \
-	lttng/event-rule/uprobe.h \
+	lttng/event-rule/userspace-probe.h \
 	lttng/event-rule/tracepoint.h
 
 noinst_HEADERS = \
@@ -190,7 +190,7 @@ noinst_HEADERS = \
 	lttng/event-rule/event-rule-internal.h \
 	lttng/event-rule/kernel-probe-internal.h \
 	lttng/event-rule/syscall-internal.h \
-	lttng/event-rule/uprobe-internal.h \
+	lttng/event-rule/userspace-probe-internal.h \
 	lttng/event-rule/tracepoint-internal.h \
 	version.h \
 	version.i
diff --git a/include/lttng/event-rule/uprobe-internal.h b/include/lttng/event-rule/userspace-probe-internal.h
similarity index 96%
rename from include/lttng/event-rule/uprobe-internal.h
rename to include/lttng/event-rule/userspace-probe-internal.h
index 41d42eb76..8ba5b2bf2 100644
--- a/include/lttng/event-rule/uprobe-internal.h
+++ b/include/lttng/event-rule/userspace-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/uprobe.h>
+#include <lttng/event-rule/userspace-probe.h>
 
 struct lttng_event_rule_userspace_probe {
 	struct lttng_event_rule parent;
diff --git a/include/lttng/event-rule/uprobe.h b/include/lttng/event-rule/userspace-probe.h
similarity index 100%
rename from include/lttng/event-rule/uprobe.h
rename to include/lttng/event-rule/userspace-probe.h
diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index bc5a83d48..84032d1ec 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -43,7 +43,7 @@
 #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>
+#include <lttng/event-rule/userspace-probe.h>
 #include <lttng/handle.h>
 #include <lttng/health.h>
 #include <lttng/kernel-probe.h>
diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 9a1f37191..fe7271ed9 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -32,7 +32,7 @@
 #include <lttng/condition/event-rule-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/uprobe-internal.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
 
 #include "lttng-sessiond.h"
 #include "lttng-syscall.h"
diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index aa6152144..9d019752b 100644
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -24,7 +24,7 @@
 #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>
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 3c076c8ff..154ab0faf 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -64,7 +64,7 @@ libcommon_la_SOURCES = \
 	event-rule/event-rule.c \
 	event-rule/kernel-probe.c \
 	event-rule/syscall.c \
-	event-rule/uprobe.c \
+	event-rule/userspace-probe.c \
 	event-rule/tracepoint.c \
 	filter.c filter.h \
 	fd-handle.c fd-handle.h \
diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 8afc18417..dfb8febfe 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -17,7 +17,7 @@
 #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>
+#include <lttng/event-rule/userspace-probe-internal.h>
 #include <stdbool.h>
 
 enum lttng_event_rule_type lttng_event_rule_get_type(
diff --git a/src/common/event-rule/uprobe.c b/src/common/event-rule/userspace-probe.c
similarity index 99%
rename from src/common/event-rule/uprobe.c
rename to src/common/event-rule/userspace-probe.c
index b8f8edee5..66db5a6e4 100644
--- a/src/common/event-rule/uprobe.c
+++ b/src/common/event-rule/userspace-probe.c
@@ -15,7 +15,7 @@
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/uprobe-internal.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
 #include <lttng/userspace-probe-internal.h>
 
 #define IS_UPROBE_EVENT_RULE(rule) \
diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 6cc9d5cd6..b45dc7ba2 100644
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -24,8 +24,8 @@
 #include <lttng/event-rule/syscall.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/uprobe-internal.h>
-#include <lttng/event-rule/uprobe.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
+#include <lttng/event-rule/userspace-probe.h>
 #include <lttng/event.h>
 #include <lttng/kernel-probe-internal.h>
 #include <lttng/kernel-probe.h>
-- 
2.34.1