From dfcd38b74df749055c9dc8ea5ff4b8c632de1ce9 Mon Sep 17 00:00:00 2001 From: yangjie Date: Tue, 7 Apr 2020 13:35:09 +0800 Subject: [PATCH 1/2] [components][dataqueue]add rt_data_queue_deinit --- components/drivers/include/ipc/dataqueue.h | 2 + components/drivers/src/dataqueue.c | 46 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/components/drivers/include/ipc/dataqueue.h b/components/drivers/include/ipc/dataqueue.h index f584c267bf..eb2fcd90cc 100644 --- a/components/drivers/include/ipc/dataqueue.h +++ b/components/drivers/include/ipc/dataqueue.h @@ -25,6 +25,7 @@ struct rt_data_queue rt_uint16_t size; rt_uint16_t lwm; rt_bool_t waiting_lwm; + rt_bool_t is_init; rt_uint16_t get_index; rt_uint16_t put_index; @@ -57,5 +58,6 @@ rt_err_t rt_data_queue_peak(struct rt_data_queue *queue, const void **data_ptr, rt_size_t *size); void rt_data_queue_reset(struct rt_data_queue *queue); +rt_err_t rt_data_queue_deinit(struct rt_data_queue *queue); #endif diff --git a/components/drivers/src/dataqueue.c b/components/drivers/src/dataqueue.c index 7553986b9f..219acb9ac8 100644 --- a/components/drivers/src/dataqueue.c +++ b/components/drivers/src/dataqueue.c @@ -31,6 +31,7 @@ rt_data_queue_init(struct rt_data_queue *queue, queue->size = size; queue->lwm = lwm; + queue->is_init = RT_TRUE; queue->get_index = 0; queue->put_index = 0; @@ -57,6 +58,11 @@ rt_err_t rt_data_queue_push(struct rt_data_queue *queue, rt_thread_t thread; rt_err_t result; + if(queue->is_init != RT_TRUE) + { + return RT_ERROR; + } + RT_ASSERT(queue != RT_NULL); result = RT_EOK; @@ -145,6 +151,11 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue, rt_ubase_t level; rt_thread_t thread; rt_err_t result; + + if(queue->is_init != RT_TRUE) + { + return RT_ERROR; + } RT_ASSERT(queue != RT_NULL); RT_ASSERT(data_ptr != RT_NULL); @@ -244,6 +255,11 @@ rt_err_t rt_data_queue_peak(struct rt_data_queue *queue, rt_size_t *size) { rt_ubase_t level; + + if(queue->is_init != RT_TRUE) + { + return RT_ERROR; + } RT_ASSERT(queue != RT_NULL); @@ -269,6 +285,11 @@ void rt_data_queue_reset(struct rt_data_queue *queue) { struct rt_thread *thread; register rt_ubase_t temp; + + if(queue->is_init != RT_TRUE) + { + return; + } rt_enter_critical(); /* wakeup all suspend threads */ @@ -325,3 +346,28 @@ void rt_data_queue_reset(struct rt_data_queue *queue) rt_schedule(); } RTM_EXPORT(rt_data_queue_reset); + +rt_err_t rt_data_queue_deinit(struct rt_data_queue *queue) +{ + rt_ubase_t level; + + if(queue->is_init != RT_TRUE) + { + return RT_ERROR; + } + + RT_ASSERT(queue != RT_NULL); + + level = rt_hw_interrupt_disable(); + + /* wakeup all suspend threads */ + rt_data_queue_reset(queue); + + queue->is_init = RT_FALSE; + rt_free(queue->queue); + + rt_hw_interrupt_enable(level); + + return RT_EOK; +} +RTM_EXPORT(rt_data_queue_deinit); From 1d7b34f471171c94605cb95b739562d2dff664c7 Mon Sep 17 00:00:00 2001 From: yangjie Date: Wed, 8 Apr 2020 11:05:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[components][dataqueue]=E4=BF=AE=E6=94=B9is?= =?UTF-8?q?=5Finit=E4=B8=BAmagic=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/include/ipc/dataqueue.h | 3 +- components/drivers/src/dataqueue.c | 37 ++++++---------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/components/drivers/include/ipc/dataqueue.h b/components/drivers/include/ipc/dataqueue.h index eb2fcd90cc..d90be76ffb 100644 --- a/components/drivers/include/ipc/dataqueue.h +++ b/components/drivers/include/ipc/dataqueue.h @@ -22,10 +22,11 @@ struct rt_data_item; /* data queue implementation */ struct rt_data_queue { + rt_uint32_t magic; + rt_uint16_t size; rt_uint16_t lwm; rt_bool_t waiting_lwm; - rt_bool_t is_init; rt_uint16_t get_index; rt_uint16_t put_index; diff --git a/components/drivers/src/dataqueue.c b/components/drivers/src/dataqueue.c index 219acb9ac8..5a802c0711 100644 --- a/components/drivers/src/dataqueue.c +++ b/components/drivers/src/dataqueue.c @@ -13,6 +13,8 @@ #include #include +#define DATAQUEUE_MAGIC 0xbead0e0e + struct rt_data_item { const void *data_ptr; @@ -29,9 +31,9 @@ rt_data_queue_init(struct rt_data_queue *queue, queue->evt_notify = evt_notify; + queue->magic = DATAQUEUE_MAGIC; queue->size = size; queue->lwm = lwm; - queue->is_init = RT_TRUE; queue->get_index = 0; queue->put_index = 0; @@ -58,11 +60,7 @@ rt_err_t rt_data_queue_push(struct rt_data_queue *queue, rt_thread_t thread; rt_err_t result; - if(queue->is_init != RT_TRUE) - { - return RT_ERROR; - } - + RT_ASSERT(queue->magic == DATAQUEUE_MAGIC); RT_ASSERT(queue != RT_NULL); result = RT_EOK; @@ -152,11 +150,7 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue, rt_thread_t thread; rt_err_t result; - if(queue->is_init != RT_TRUE) - { - return RT_ERROR; - } - + RT_ASSERT(queue->magic == DATAQUEUE_MAGIC); RT_ASSERT(queue != RT_NULL); RT_ASSERT(data_ptr != RT_NULL); RT_ASSERT(size != RT_NULL); @@ -256,11 +250,7 @@ rt_err_t rt_data_queue_peak(struct rt_data_queue *queue, { rt_ubase_t level; - if(queue->is_init != RT_TRUE) - { - return RT_ERROR; - } - + RT_ASSERT(queue->magic == DATAQUEUE_MAGIC); RT_ASSERT(queue != RT_NULL); level = rt_hw_interrupt_disable(); @@ -286,11 +276,8 @@ void rt_data_queue_reset(struct rt_data_queue *queue) struct rt_thread *thread; register rt_ubase_t temp; - if(queue->is_init != RT_TRUE) - { - return; - } - + RT_ASSERT(queue->magic == DATAQUEUE_MAGIC); + rt_enter_critical(); /* wakeup all suspend threads */ @@ -351,11 +338,7 @@ rt_err_t rt_data_queue_deinit(struct rt_data_queue *queue) { rt_ubase_t level; - if(queue->is_init != RT_TRUE) - { - return RT_ERROR; - } - + RT_ASSERT(queue->magic == DATAQUEUE_MAGIC); RT_ASSERT(queue != RT_NULL); level = rt_hw_interrupt_disable(); @@ -363,7 +346,7 @@ rt_err_t rt_data_queue_deinit(struct rt_data_queue *queue) /* wakeup all suspend threads */ rt_data_queue_reset(queue); - queue->is_init = RT_FALSE; + queue->magic = 0; rt_free(queue->queue); rt_hw_interrupt_enable(level);