From b503be2d02459cea162e85c0082a586b73780981 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 22 Mar 2021 08:09:55 -0400 Subject: [PATCH] kernel: poll: rename reserved 'signal' symbol This symbol is reserved and usage of reserved symbols violates the coding guidelines. (MISRA 21.2) NAME signal - ANSI C signal handling SYNOPSIS #include sighandler_t signal(int signum, sighandler_t handler); Signed-off-by: Anas Nashif --- include/kernel.h | 20 ++++++++++---------- kernel/poll.c | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/include/kernel.h b/include/kernel.h index 03f3c586020..ee7aa34504e 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -5313,36 +5313,36 @@ __syscall int k_poll(struct k_poll_event *events, int num_events, * * Ready a poll signal object to be signaled via k_poll_signal_raise(). * - * @param signal A poll signal. + * @param sig A poll signal. * * @return N/A */ -__syscall void k_poll_signal_init(struct k_poll_signal *signal); +__syscall void k_poll_signal_init(struct k_poll_signal *sig); /* * @brief Reset a poll signal object's state to unsignaled. * - * @param signal A poll signal object + * @param sig A poll signal object */ -__syscall void k_poll_signal_reset(struct k_poll_signal *signal); +__syscall void k_poll_signal_reset(struct k_poll_signal *sig); -static inline void z_impl_k_poll_signal_reset(struct k_poll_signal *signal) +static inline void z_impl_k_poll_signal_reset(struct k_poll_signal *sig) { - signal->signaled = 0U; + sig->signaled = 0U; } /** * @brief Fetch the signaled state and result value of a poll signal * - * @param signal A poll signal object + * @param sig A poll signal object * @param signaled An integer buffer which will be written nonzero if the * object was signaled * @param result An integer destination buffer which will be written with the * result value if the object was signaled, or an undefined * value if it was not. */ -__syscall void k_poll_signal_check(struct k_poll_signal *signal, +__syscall void k_poll_signal_check(struct k_poll_signal *sig, unsigned int *signaled, int *result); /** @@ -5362,14 +5362,14 @@ __syscall void k_poll_signal_check(struct k_poll_signal *signal, * this function returns an error indicating that an expiring poll was * not notified. The next k_poll() will detect the missed raise. * - * @param signal A poll signal. + * @param sig A poll signal. * @param result The value to store in the result field of the signal. * * @retval 0 The signal was delivered successfully. * @retval -EAGAIN The polling thread's timeout is in the process of expiring. */ -__syscall int k_poll_signal_raise(struct k_poll_signal *signal, int result); +__syscall int k_poll_signal_raise(struct k_poll_signal *sig, int result); /** * @internal diff --git a/kernel/poll.c b/kernel/poll.c index 18452ce4452..f9e0eef679d 100644 --- a/kernel/poll.c +++ b/kernel/poll.c @@ -415,51 +415,51 @@ void z_handle_obj_poll_events(sys_dlist_t *events, uint32_t state) } } -void z_impl_k_poll_signal_init(struct k_poll_signal *signal) +void z_impl_k_poll_signal_init(struct k_poll_signal *sig) { - sys_dlist_init(&signal->poll_events); - signal->signaled = 0U; - /* signal->result is left unitialized */ - z_object_init(signal); + sys_dlist_init(&sig->poll_events); + sig->signaled = 0U; + /* sig->result is left unitialized */ + z_object_init(sig); } #ifdef CONFIG_USERSPACE -static inline void z_vrfy_k_poll_signal_init(struct k_poll_signal *signal) +static inline void z_vrfy_k_poll_signal_init(struct k_poll_signal *sig) { - Z_OOPS(Z_SYSCALL_OBJ_INIT(signal, K_OBJ_POLL_SIGNAL)); - z_impl_k_poll_signal_init(signal); + Z_OOPS(Z_SYSCALL_OBJ_INIT(sig, K_OBJ_POLL_SIGNAL)); + z_impl_k_poll_signal_init(sig); } #include #endif -void z_impl_k_poll_signal_check(struct k_poll_signal *signal, +void z_impl_k_poll_signal_check(struct k_poll_signal *sig, unsigned int *signaled, int *result) { - *signaled = signal->signaled; - *result = signal->result; + *signaled = sig->signaled; + *result = sig->result; } #ifdef CONFIG_USERSPACE -void z_vrfy_k_poll_signal_check(struct k_poll_signal *signal, +void z_vrfy_k_poll_signal_check(struct k_poll_signal *sig, unsigned int *signaled, int *result) { - Z_OOPS(Z_SYSCALL_OBJ(signal, K_OBJ_POLL_SIGNAL)); + Z_OOPS(Z_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL)); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(signaled, sizeof(unsigned int))); Z_OOPS(Z_SYSCALL_MEMORY_WRITE(result, sizeof(int))); - z_impl_k_poll_signal_check(signal, signaled, result); + z_impl_k_poll_signal_check(sig, signaled, result); } #include #endif -int z_impl_k_poll_signal_raise(struct k_poll_signal *signal, int result) +int z_impl_k_poll_signal_raise(struct k_poll_signal *sig, int result) { k_spinlock_key_t key = k_spin_lock(&lock); struct k_poll_event *poll_event; - signal->result = result; - signal->signaled = 1U; + sig->result = result; + sig->signaled = 1U; - poll_event = (struct k_poll_event *)sys_dlist_get(&signal->poll_events); + poll_event = (struct k_poll_event *)sys_dlist_get(&sig->poll_events); if (poll_event == NULL) { k_spin_unlock(&lock, key); return 0; @@ -472,18 +472,18 @@ int z_impl_k_poll_signal_raise(struct k_poll_signal *signal, int result) } #ifdef CONFIG_USERSPACE -static inline int z_vrfy_k_poll_signal_raise(struct k_poll_signal *signal, +static inline int z_vrfy_k_poll_signal_raise(struct k_poll_signal *sig, int result) { - Z_OOPS(Z_SYSCALL_OBJ(signal, K_OBJ_POLL_SIGNAL)); - return z_impl_k_poll_signal_raise(signal, result); + Z_OOPS(Z_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL)); + return z_impl_k_poll_signal_raise(sig, result); } #include -static inline void z_vrfy_k_poll_signal_reset(struct k_poll_signal *signal) +static inline void z_vrfy_k_poll_signal_reset(struct k_poll_signal *sig) { - Z_OOPS(Z_SYSCALL_OBJ(signal, K_OBJ_POLL_SIGNAL)); - z_impl_k_poll_signal_reset(signal); + Z_OOPS(Z_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL)); + z_impl_k_poll_signal_reset(sig); } #include