add support for dynaminc sem and dynamic mutex

This commit is contained in:
mculover666
2021-03-11 09:46:24 +08:00
parent 54022c2481
commit da61aa0a49
8 changed files with 182 additions and 7 deletions

View File

@@ -124,6 +124,10 @@ typedef enum k_err_en {
K_ERR_TIMER_INVALID_OPT,
K_ERR_TIMER_STOPPED,
K_ERR_TIMER_RUNNING,
K_ERR_SEM_OUT_OF_MEMORY = 2200u,
K_ERR_MUTEX_OUT_OF_MEMORY = 2300u,
} k_err_t;
#endif /* _TOS_ERR_H_ */

View File

@@ -47,6 +47,19 @@ typedef struct k_mutex_st {
*/
__API__ k_err_t tos_mutex_create(k_mutex_t *mutex);
/**
* @brief Create a dynamic mutex.
* create a dynamic mutex.
*
* @attention None
*
* @param[in] mutex pointer to the pointer of the mutex.
*
* @return errcode
* @retval #K_ERR_NONE return successfully.
*/
__API__ k_err_t tos_mutex_create_dyn(k_mutex_t **mutex);
/**
* @brief Destroy a mutex.
* destroy a mutex.

View File

@@ -61,6 +61,35 @@ __API__ k_err_t tos_sem_create_max(k_sem_t *sem, k_sem_cnt_t init_count, k_sem_c
*/
__API__ k_err_t tos_sem_create(k_sem_t *sem, k_sem_cnt_t init_count);
/**
* @brief Create a dynamic semaphore with a limitation of maximum count.
* create a dynamic semaphore with a limitation of maximum count.
*
* @attention None
*
* @param[in] sem pointer to the pointer of the semaphore.
* @param[in] init_count initial count of the semaphore.
* @param[in] max_count maximum count of the semaphore.
*
* @return errcode
* @retval #K_ERR_NONE return successfully.
*/
__API__ k_err_t tos_sem_create_max_dyn(k_sem_t **sem, k_sem_cnt_t init_count, k_sem_cnt_t max_count);
/**
* @brief Create a dynamic semaphore.
* create a dynamic semaphore.
*
* @attention None
*
* @param[in] sem pointer to the pointer of the semaphore.
* @param[in] init_count initial count of the semaphore.
*
* @return errcode
* @retval #K_ERR_NONE return successfully.
*/
__API__ k_err_t tos_sem_create_dyn(k_sem_t **sem, k_sem_cnt_t init_count);
/**
* @brief Destroy a semaphore.
* destroy a semaphore.

View File

@@ -83,6 +83,32 @@ __API__ k_err_t tos_mutex_create(k_mutex_t *mutex)
return K_ERR_NONE;
}
__API__ k_err_t tos_mutex_create_dyn(k_mutex_t **mutex)
{
k_mutex_t *the_mutex;
TOS_IN_IRQ_CHECK();
TOS_PTR_SANITY_CHECK(mutex);
the_mutex = tos_mmheap_calloc(1, sizeof(k_mutex_t));
if (!the_mutex) {
return K_ERR_MUTEX_OUT_OF_MEMORY;
}
pend_object_init(&the_mutex->pend_obj);
the_mutex->pend_nesting = (k_nesting_t)0u;
the_mutex->owner = K_NULL;
the_mutex->owner_orig_prio = K_TASK_PRIO_INVALID;
tos_list_init(&the_mutex->owner_anchor);
TOS_OBJ_INIT(the_mutex, KNL_OBJ_TYPE_MUTEX);
knl_object_alloc_set_dynamic(&the_mutex->knl_obj);
*mutex = the_mutex;
return K_ERR_NONE;
}
__API__ k_err_t tos_mutex_destroy(k_mutex_t *mutex)
{
TOS_CPU_CPSR_ALLOC();
@@ -101,7 +127,12 @@ __API__ k_err_t tos_mutex_destroy(k_mutex_t *mutex)
pend_object_deinit(&mutex->pend_obj);
TOS_OBJ_DEINIT(mutex);
if (knl_object_alloc_is_dynamic(&mutex->knl_obj)) {
TOS_OBJ_DEINIT(mutex);
tos_mmheap_free(mutex);
} else {
TOS_OBJ_DEINIT(mutex);
}
TOS_CPU_INT_ENABLE();
knl_sched();

View File

@@ -41,6 +41,40 @@ __API__ k_err_t tos_sem_create(k_sem_t *sem, k_sem_cnt_t init_count)
return tos_sem_create_max(sem, init_count, (k_sem_cnt_t)-1);
}
__API__ k_err_t tos_sem_create_max_dyn(k_sem_t **sem, k_sem_cnt_t init_count, k_sem_cnt_t max_count)
{
k_sem_t *the_sem;
TOS_IN_IRQ_CHECK();
TOS_PTR_SANITY_CHECK(sem);
if (unlikely(init_count > max_count)) {
init_count = max_count;
}
the_sem = tos_mmheap_calloc(1, sizeof(k_sem_t));
if (!the_sem) {
return K_ERR_SEM_OUT_OF_MEMORY;
}
the_sem->count = init_count;
the_sem->count_max = max_count;
pend_object_init(&the_sem->pend_obj);
TOS_OBJ_INIT(the_sem, KNL_OBJ_TYPE_SEMAPHORE);
knl_object_alloc_set_dynamic(&the_sem->knl_obj);
*sem = the_sem;
return K_ERR_NONE;
}
__API__ k_err_t tos_sem_create_dyn(k_sem_t **sem, k_sem_cnt_t init_count)
{
return tos_sem_create_max_dyn(sem, init_count, (k_sem_cnt_t)-1);
}
__API__ k_err_t tos_sem_destroy(k_sem_t *sem)
{
TOS_CPU_CPSR_ALLOC();
@@ -54,7 +88,12 @@ __API__ k_err_t tos_sem_destroy(k_sem_t *sem)
pend_object_deinit(&sem->pend_obj);
TOS_OBJ_DEINIT(sem);
if (knl_object_alloc_is_dynamic(&sem->knl_obj)) {
TOS_OBJ_DEINIT(sem);
tos_mmheap_free(sem);
} else {
TOS_OBJ_DEINIT(sem);
}
TOS_CPU_INT_ENABLE();
knl_sched();