Rename LTTNG_SYSCALL_MATCH_ -> LTTNG_KERNEL_SYSCALL_MATCH_

This is done to keep the same name scheme used to all ABI enums.

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I8e1010ab21a47b7f1e519df498acd230315cdc26

diff --git a/include/lttng/abi.h b/include/lttng/abi.h
index 3b5cad5d9f5d3206f9c04b6564415c452906b2f4..75c2cb087fdb1ea791413c832b0e6c5c18dfae27 100644 (file)
--- a/include/lttng/abi.h
+++ b/include/lttng/abi.h
@@ -103,8 +103,8 @@ enum lttng_kernel_syscall_abi {
 };
 
 enum lttng_kernel_syscall_match {
-       LTTNG_SYSCALL_MATCH_NAME = 0,
-       LTTNG_SYSCALL_MATCH_NR = 1,             /* Not implemented. */
+       LTTNG_KERNEL_SYSCALL_MATCH_NAME = 0,
+       LTTNG_KERNEL_SYSCALL_MATCH_NR = 1,              /* Not implemented. */
 };
 
 struct lttng_kernel_syscall {

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index 984c0a2a5964143f36564c14bd50b15216f87029..fbbdbabf15600bb00c0986022cf6c89db4e00a70 100644 (file)
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -1598,7 +1598,7 @@ int lttng_abi_validate_event_param(struct lttng_kernel_event *event_param)
                        return -EINVAL;
                }
                switch (event_param->u.syscall.match) {
-               case LTTNG_SYSCALL_MATCH_NAME:
+               case LTTNG_KERNEL_SYSCALL_MATCH_NAME:
                        break;
                default:
                        return -EINVAL;

diff --git a/src/lttng-events.c b/src/lttng-events.c
index 41fea8500c550b63634237b0569a63dc192f46a9..91a0810030047d59ea281a8dced6d91dc49f5aca 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -1713,7 +1713,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
                        return -EINVAL;
                }
                switch (enabler->event_param.u.syscall.match) {
-               case LTTNG_SYSCALL_MATCH_NAME:
+               case LTTNG_KERNEL_SYSCALL_MATCH_NAME:
                        switch (enabler->format_type) {
                        case LTTNG_ENABLER_FORMAT_STAR_GLOB:
                                return lttng_match_enabler_star_glob(desc_name, enabler_name);
@@ -1723,7 +1723,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
                                return -EINVAL;
                        }
                        break;
-               case LTTNG_SYSCALL_MATCH_NR:
+               case LTTNG_KERNEL_SYSCALL_MATCH_NR:
                        return -EINVAL; /* Not implemented. */
                default:
                        return -EINVAL;
@@ -1938,7 +1938,7 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
        if (base_enabler->event_param.instrumentation == LTTNG_KERNEL_SYSCALL &&
                        base_enabler->event_param.u.syscall.entryexit == LTTNG_KERNEL_SYSCALL_ENTRYEXIT &&
                        base_enabler->event_param.u.syscall.abi == LTTNG_KERNEL_SYSCALL_ABI_ALL &&
-                       base_enabler->event_param.u.syscall.match == LTTNG_SYSCALL_MATCH_NAME &&
+                       base_enabler->event_param.u.syscall.match == LTTNG_KERNEL_SYSCALL_MATCH_NAME &&
                        !strcmp(base_enabler->event_param.name, "*")) {
                if (base_enabler->enabled)
                        WRITE_ONCE(chan->syscall_all, 1);