From 79a0524b60a7d33a20de8d44e9eb4105822e96eb Mon Sep 17 00:00:00 2001 From: daishengdong Date: Fri, 6 Mar 2020 19:27:21 +0800 Subject: [PATCH] remove some redundant judgement --- kernel/core/include/tos_klib.h | 2 -- kernel/core/tos_barrier.c | 9 ++------- kernel/core/tos_completion.c | 4 +--- kernel/core/tos_countdownlatch.c | 4 +--- kernel/core/tos_event.c | 4 +--- kernel/core/tos_mail_queue.c | 8 ++------ kernel/core/tos_message_queue.c | 8 ++------ kernel/core/tos_mutex.c | 4 +--- kernel/core/tos_priority_mail_queue.c | 8 ++------ kernel/core/tos_priority_message_queue.c | 8 ++------ kernel/core/tos_sem.c | 4 +--- kernel/core/tos_tick.c | 2 +- osal/posix/pthread_prv.c | 4 ++-- 13 files changed, 18 insertions(+), 51 deletions(-) diff --git a/kernel/core/include/tos_klib.h b/kernel/core/include/tos_klib.h index 94342e74..5f6ffdfc 100644 --- a/kernel/core/include/tos_klib.h +++ b/kernel/core/include/tos_klib.h @@ -67,7 +67,6 @@ TOS_MACRO_BEGIN \ } \ TOS_MACRO_END - #define TOS_OBJ_VERIFY_RC(obj, obj_type, return_code) \ TOS_MACRO_BEGIN \ if (!knl_object_verify(&obj->knl_obj, obj_type)) { \ @@ -82,7 +81,6 @@ TOS_MACRO_BEGIN \ } \ TOS_MACRO_END - #define TOS_OBJ_TEST_RC(obj, obj_type, return_code) \ TOS_MACRO_BEGIN \ if (knl_object_verify(&obj->knl_obj, obj_type)) { \ diff --git a/kernel/core/tos_barrier.c b/kernel/core/tos_barrier.c index 96edfa5a..50bab687 100644 --- a/kernel/core/tos_barrier.c +++ b/kernel/core/tos_barrier.c @@ -41,9 +41,7 @@ __API__ k_err_t tos_barrier_destroy(k_barrier_t *barrier) TOS_CPU_INT_DISABLE(); - if (!pend_is_nopending(&barrier->pend_obj)) { - pend_wakeup_all(&barrier->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&barrier->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&barrier->pend_obj); @@ -72,10 +70,7 @@ __API__ k_err_t tos_barrier_pend(k_barrier_t *barrier) if (barrier->count == (k_barrier_cnt_t)1u) { barrier->count = (k_barrier_cnt_t)0u; - - if (!pend_is_nopending(&barrier->pend_obj)) { - pend_wakeup_all(&barrier->pend_obj, PEND_STATE_POST); - } + pend_wakeup_all(&barrier->pend_obj, PEND_STATE_POST); TOS_CPU_INT_ENABLE(); return K_ERR_NONE; diff --git a/kernel/core/tos_completion.c b/kernel/core/tos_completion.c index c9eb4eff..f4bb7153 100644 --- a/kernel/core/tos_completion.c +++ b/kernel/core/tos_completion.c @@ -37,9 +37,7 @@ __API__ k_err_t tos_completion_destroy(k_completion_t *completion) TOS_CPU_INT_DISABLE(); - if (!pend_is_nopending(&completion->pend_obj)) { - pend_wakeup_all(&completion->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&completion->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&completion->pend_obj); diff --git a/kernel/core/tos_countdownlatch.c b/kernel/core/tos_countdownlatch.c index 25a484e6..b69154ea 100644 --- a/kernel/core/tos_countdownlatch.c +++ b/kernel/core/tos_countdownlatch.c @@ -37,9 +37,7 @@ __API__ k_err_t tos_countdownlatch_destroy(k_countdownlatch_t *countdownlatch) TOS_CPU_INT_DISABLE(); - if (!pend_is_nopending(&countdownlatch->pend_obj)) { - pend_wakeup_all(&countdownlatch->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&countdownlatch->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&countdownlatch->pend_obj); diff --git a/kernel/core/tos_event.c b/kernel/core/tos_event.c index 92f9bc70..145fbba4 100644 --- a/kernel/core/tos_event.c +++ b/kernel/core/tos_event.c @@ -39,9 +39,7 @@ __API__ k_err_t tos_event_destroy(k_event_t *event) TOS_CPU_INT_DISABLE(); - if (!pend_is_nopending(&event->pend_obj)) { - pend_wakeup_all(&event->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&event->pend_obj, PEND_STATE_DESTROY); event->flag = (k_event_flag_t)0u; diff --git a/kernel/core/tos_mail_queue.c b/kernel/core/tos_mail_queue.c index b601f1e9..57065974 100644 --- a/kernel/core/tos_mail_queue.c +++ b/kernel/core/tos_mail_queue.c @@ -62,9 +62,7 @@ __API__ k_err_t tos_mail_q_destroy(k_mail_q_t *mail_q) return err; } - if (!pend_is_nopending(&mail_q->pend_obj)) { - pend_wakeup_all(&mail_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&mail_q->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&mail_q->pend_obj); @@ -120,9 +118,7 @@ __API__ k_err_t tos_mail_q_destroy_dyn(k_mail_q_t *mail_q) return err; } - if (!pend_is_nopending(&mail_q->pend_obj)) { - pend_wakeup_all(&mail_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&mail_q->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&mail_q->pend_obj); diff --git a/kernel/core/tos_message_queue.c b/kernel/core/tos_message_queue.c index 22ff9050..bbf65524 100644 --- a/kernel/core/tos_message_queue.c +++ b/kernel/core/tos_message_queue.c @@ -63,9 +63,7 @@ __API__ k_err_t tos_msg_q_destroy(k_msg_q_t *msg_q) return err; } - if (!pend_is_nopending(&msg_q->pend_obj)) { - pend_wakeup_all(&msg_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&msg_q->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&msg_q->pend_obj); @@ -121,9 +119,7 @@ __API__ k_err_t tos_msg_q_destroy_dyn(k_msg_q_t *msg_q) return err; } - if (!pend_is_nopending(&msg_q->pend_obj)) { - pend_wakeup_all(&msg_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&msg_q->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&msg_q->pend_obj); diff --git a/kernel/core/tos_mutex.c b/kernel/core/tos_mutex.c index 4c242d17..73fe9cc1 100644 --- a/kernel/core/tos_mutex.c +++ b/kernel/core/tos_mutex.c @@ -93,9 +93,7 @@ __API__ k_err_t tos_mutex_destroy(k_mutex_t *mutex) TOS_CPU_INT_DISABLE(); - if (!pend_is_nopending(&mutex->pend_obj)) { - pend_wakeup_all(&mutex->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&mutex->pend_obj, PEND_STATE_DESTROY); if (mutex->owner) { mutex_old_owner_release(mutex); diff --git a/kernel/core/tos_priority_mail_queue.c b/kernel/core/tos_priority_mail_queue.c index 6ec43760..cba5eccb 100644 --- a/kernel/core/tos_priority_mail_queue.c +++ b/kernel/core/tos_priority_mail_queue.c @@ -66,9 +66,7 @@ __API__ k_err_t tos_prio_mail_q_destroy(k_prio_mail_q_t *prio_mail_q) return err; } - if (!pend_is_nopending(&prio_mail_q->pend_obj)) { - pend_wakeup_all(&prio_mail_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&prio_mail_q->pend_obj, PEND_STATE_DESTROY); tos_mmheap_free(prio_mail_q->prio_q_mgr_array); prio_mail_q->prio_q_mgr_array = K_NULL; @@ -123,9 +121,7 @@ __API__ k_err_t tos_prio_mail_q_destroy_dyn(k_prio_mail_q_t *prio_mail_q) return err; } - if (!pend_is_nopending(&prio_mail_q->pend_obj)) { - pend_wakeup_all(&prio_mail_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&prio_mail_q->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&prio_mail_q->pend_obj); diff --git a/kernel/core/tos_priority_message_queue.c b/kernel/core/tos_priority_message_queue.c index 0af3fafe..a94e3f37 100644 --- a/kernel/core/tos_priority_message_queue.c +++ b/kernel/core/tos_priority_message_queue.c @@ -66,9 +66,7 @@ __API__ k_err_t tos_prio_msg_q_destroy(k_prio_msg_q_t *prio_msg_q) return err; } - if (!pend_is_nopending(&prio_msg_q->pend_obj)) { - pend_wakeup_all(&prio_msg_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&prio_msg_q->pend_obj, PEND_STATE_DESTROY); tos_mmheap_free(prio_msg_q->prio_q_mgr_array); prio_msg_q->prio_q_mgr_array = K_NULL; @@ -123,9 +121,7 @@ __API__ k_err_t tos_prio_msg_q_destroy_dyn(k_prio_msg_q_t *prio_msg_q) return err; } - if (!pend_is_nopending(&prio_msg_q->pend_obj)) { - pend_wakeup_all(&prio_msg_q->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&prio_msg_q->pend_obj, PEND_STATE_DESTROY); tos_mmheap_free(prio_msg_q->prio_q_mgr_array); prio_msg_q->prio_q_mgr_array = K_NULL; diff --git a/kernel/core/tos_sem.c b/kernel/core/tos_sem.c index 8a8297d9..40ca0bde 100644 --- a/kernel/core/tos_sem.c +++ b/kernel/core/tos_sem.c @@ -45,9 +45,7 @@ __API__ k_err_t tos_sem_destroy(k_sem_t *sem) TOS_CPU_INT_DISABLE(); - if (!pend_is_nopending(&sem->pend_obj)) { - pend_wakeup_all(&sem->pend_obj, PEND_STATE_DESTROY); - } + pend_wakeup_all(&sem->pend_obj, PEND_STATE_DESTROY); pend_object_deinit(&sem->pend_obj); diff --git a/kernel/core/tos_tick.c b/kernel/core/tos_tick.c index 47d82bf2..8fb4bfc5 100644 --- a/kernel/core/tos_tick.c +++ b/kernel/core/tos_tick.c @@ -108,7 +108,7 @@ __KNL__ void tick_update(k_tick_t tick) break; } - // we are pending on something, but tick's up, no longer waitting + // we are pending for something, but tick's up, no longer waitting pend_task_wakeup(task, PEND_STATE_TIMEOUT); } diff --git a/osal/posix/pthread_prv.c b/osal/posix/pthread_prv.c index be7dbc04..6c9aa559 100644 --- a/osal/posix/pthread_prv.c +++ b/osal/posix/pthread_prv.c @@ -139,7 +139,7 @@ __KNL__ void pthread_data_clear(pthread_key_t key) } } -__KNL__ int pthread_key_ctl_init(void) +__STATIC__ int pthread_key_ctl_init(void) { int i = 0; @@ -278,7 +278,7 @@ __KNL__ void pthread_unlock(void) tos_mutex_post(&pthread_mutex); } -__KNL__ int pthread_lock_init(void) +__STATIC__ int pthread_lock_init(void) { if (tos_mutex_create(&pthread_mutex) != K_ERR_NONE) { return -1;