PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some redundant judgement

Browse Source
This commit is contained in:
daishengdong
2020-03-06 19:27:21 +08:00
parent ec497c52de
commit 79a0524b60
13 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/core/include/tos_klib.h
View File

@@ -67,7 +67,6 @@ TOS_MACRO_BEGIN \
} \ } \
TOS_MACRO_END TOS_MACRO_END
#define TOS_OBJ_VERIFY_RC(obj, obj_type, return_code) \ #define TOS_OBJ_VERIFY_RC(obj, obj_type, return_code) \
TOS_MACRO_BEGIN \ TOS_MACRO_BEGIN \
if (!knl_object_verify(&obj->knl_obj, obj_type)) { \ if (!knl_object_verify(&obj->knl_obj, obj_type)) { \
@@ -82,7 +81,6 @@ TOS_MACRO_BEGIN \
} \ } \
TOS_MACRO_END TOS_MACRO_END
#define TOS_OBJ_TEST_RC(obj, obj_type, return_code) \ #define TOS_OBJ_TEST_RC(obj, obj_type, return_code) \
TOS_MACRO_BEGIN \ TOS_MACRO_BEGIN \
if (knl_object_verify(&obj->knl_obj, obj_type)) { \ if (knl_object_verify(&obj->knl_obj, obj_type)) { \

9
kernel/core/tos_barrier.c
View File

@@ -41,9 +41,7 @@ __API__ k_err_t tos_barrier_destroy(k_barrier_t *barrier)
TOS_CPU_INT_DISABLE(); 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); 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) { if (barrier->count == (k_barrier_cnt_t)1u) {
barrier->count = (k_barrier_cnt_t)0u; barrier->count = (k_barrier_cnt_t)0u;
pend_wakeup_all(&barrier->pend_obj, PEND_STATE_POST);
if (!pend_is_nopending(&barrier->pend_obj)) {
pend_wakeup_all(&barrier->pend_obj, PEND_STATE_POST);
}
TOS_CPU_INT_ENABLE(); TOS_CPU_INT_ENABLE();
return K_ERR_NONE; return K_ERR_NONE;

4
kernel/core/tos_completion.c
View File

@@ -37,9 +37,7 @@ __API__ k_err_t tos_completion_destroy(k_completion_t *completion)
TOS_CPU_INT_DISABLE(); 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); pend_object_deinit(&completion->pend_obj);

4
kernel/core/tos_countdownlatch.c
View File

@@ -37,9 +37,7 @@ __API__ k_err_t tos_countdownlatch_destroy(k_countdownlatch_t *countdownlatch)
TOS_CPU_INT_DISABLE(); 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); pend_object_deinit(&countdownlatch->pend_obj);

4
kernel/core/tos_event.c
View File

@@ -39,9 +39,7 @@ __API__ k_err_t tos_event_destroy(k_event_t *event)
TOS_CPU_INT_DISABLE(); 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; event->flag = (k_event_flag_t)0u;

8
kernel/core/tos_mail_queue.c
View File

@@ -62,9 +62,7 @@ __API__ k_err_t tos_mail_q_destroy(k_mail_q_t *mail_q)
return err; 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); 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; 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); pend_object_deinit(&mail_q->pend_obj);

8
kernel/core/tos_message_queue.c
View File

@@ -63,9 +63,7 @@ __API__ k_err_t tos_msg_q_destroy(k_msg_q_t *msg_q)
return err; 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); 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; 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); pend_object_deinit(&msg_q->pend_obj);

4
kernel/core/tos_mutex.c
View File

@@ -93,9 +93,7 @@ __API__ k_err_t tos_mutex_destroy(k_mutex_t *mutex)
TOS_CPU_INT_DISABLE(); 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) { if (mutex->owner) {
mutex_old_owner_release(mutex); mutex_old_owner_release(mutex);

8
kernel/core/tos_priority_mail_queue.c
View File

@@ -66,9 +66,7 @@ __API__ k_err_t tos_prio_mail_q_destroy(k_prio_mail_q_t *prio_mail_q)
return err; 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); tos_mmheap_free(prio_mail_q->prio_q_mgr_array);
prio_mail_q->prio_q_mgr_array = K_NULL; 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; 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); pend_object_deinit(&prio_mail_q->pend_obj);

8
kernel/core/tos_priority_message_queue.c
View File

@@ -66,9 +66,7 @@ __API__ k_err_t tos_prio_msg_q_destroy(k_prio_msg_q_t *prio_msg_q)
return err; 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); tos_mmheap_free(prio_msg_q->prio_q_mgr_array);
prio_msg_q->prio_q_mgr_array = K_NULL; 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; 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); tos_mmheap_free(prio_msg_q->prio_q_mgr_array);
prio_msg_q->prio_q_mgr_array = K_NULL; prio_msg_q->prio_q_mgr_array = K_NULL;

4
kernel/core/tos_sem.c
View File

@@ -45,9 +45,7 @@ __API__ k_err_t tos_sem_destroy(k_sem_t *sem)
TOS_CPU_INT_DISABLE(); 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); pend_object_deinit(&sem->pend_obj);

2
kernel/core/tos_tick.c
View File

@@ -108,7 +108,7 @@ __KNL__ void tick_update(k_tick_t tick)
break; 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); pend_task_wakeup(task, PEND_STATE_TIMEOUT);
} }

4
osal/posix/pthread_prv.c
View File

@@ -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; int i = 0;
@@ -278,7 +278,7 @@ __KNL__ void pthread_unlock(void)
tos_mutex_post(&pthread_mutex); 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) { if (tos_mutex_create(&pthread_mutex) != K_ERR_NONE) {
return -1; return -1;