From 4c528368233229e44da0c6326e036c97a48ad294 Mon Sep 17 00:00:00 2001 From: Dan Schatzberg Date: Wed, 2 Aug 2023 06:31:32 -0700 Subject: [PATCH] scx: Rename "type" -> "exit_type" When used from a bpf scheduler that is launched via libbpf-rs this naming runs into issues because "type" is a reserved keyword in Rust. Signed-off-by: Dan Schatzberg --- tools/sched_ext/user_exit_info.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/sched_ext/user_exit_info.h b/tools/sched_ext/user_exit_info.h index e701ef0e0b86c3..9bb0b46480e78d 100644 --- a/tools/sched_ext/user_exit_info.h +++ b/tools/sched_ext/user_exit_info.h @@ -11,7 +11,7 @@ #define __USER_EXIT_INFO_H struct user_exit_info { - int type; + int exit_type; char reason[128]; char msg[1024]; }; @@ -27,7 +27,7 @@ static inline void uei_record(struct user_exit_info *uei, bpf_probe_read_kernel_str(uei->reason, sizeof(uei->reason), ei->reason); bpf_probe_read_kernel_str(uei->msg, sizeof(uei->msg), ei->msg); /* use __sync to force memory barrier */ - __sync_val_compare_and_swap(&uei->type, uei->type, ei->type); + __sync_val_compare_and_swap(&uei->exit_type, uei->exit_type, ei->type); } #else /* !__bpf__ */ @@ -35,7 +35,7 @@ static inline void uei_record(struct user_exit_info *uei, static inline bool uei_exited(struct user_exit_info *uei) { /* use __sync to force memory barrier */ - return __sync_val_compare_and_swap(&uei->type, -1, -1); + return __sync_val_compare_and_swap(&uei->exit_type, -1, -1); } static inline void uei_print(const struct user_exit_info *uei)