From cff6938b5405c9125a5149f03e504d7b1cc4b8a4 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Tue, 24 Nov 2020 21:18:46 -0500 Subject: [PATCH] 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 Signed-off-by: Mathieu Desnoyers Change-Id: I8e1010ab21a47b7f1e519df498acd230315cdc26 --- include/lttng/abi.h | 4 ++-- src/lttng-abi.c | 2 +- src/lttng-events.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/lttng/abi.h b/include/lttng/abi.h index 3b5cad5d..75c2cb08 100644 --- 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 984c0a2a..fbbdbabf 100644 --- 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 41fea850..91a08100 100644 --- 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); -- 2.34.1