diff options
| author | 螺丝松掉的人 <[email protected]> | 2023-02-09 11:55:52 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-08 22:55:52 -0500 |
| commit | 20459ec4d3b95ddf64b795ee96a513df2dcf2756 (patch) | |
| tree | f64e989f903ef822b96e99130ba87e357c938d44 /components | |
| parent | f58d3c5200d5a51a39503c5311422e2fb99d3d20 (diff) | |
[ringbuffer] ringbuffer size boost to 32bit (#6915)
* ringbuffer size boost to 32bit
* 添加ringbuffer测试demo
related: #682
----
Co-authored-by: Zxy <[email protected]>
Co-authored-by: Man, Jianting (Meco) <[email protected]>
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/include/ipc/ringbuffer.h | 31 | ||||
| -rw-r--r-- | components/drivers/ipc/ringbuffer.c | 20 |
2 files changed, 24 insertions, 27 deletions
diff --git a/components/drivers/include/ipc/ringbuffer.h b/components/drivers/include/ipc/ringbuffer.h index 97abf37097..fc2434cf4e 100644 --- a/components/drivers/include/ipc/ringbuffer.h +++ b/components/drivers/include/ipc/ringbuffer.h @@ -37,18 +37,15 @@ struct rt_ringbuffer * | 0 | 1 | 2 | 3 | 4 | 5 | 6 ||| 0 | 1 | 2 | 3 | 4 | 5 | 6 | Empty * +---+---+---+---+---+---+---+|+~~~+~~~+~~~+~~~+~~~+~~~+~~~+ * read_idx-^ ^-write_idx - * - * The tradeoff is we could only use 32KiB of buffer for 16 bit of index. - * But it should be enough for most of the cases. - * - * Ref: http://en.wikipedia.org/wiki/Circular_buffer#Mirroring */ - rt_uint16_t read_mirror : 1; - rt_uint16_t read_index : 15; - rt_uint16_t write_mirror : 1; - rt_uint16_t write_index : 15; + */ + + rt_uint32_t read_mirror : 1; + rt_uint32_t read_index : 31; + rt_uint32_t write_mirror : 1; + rt_uint32_t write_index : 31; /* as we use msb of index as mirror bit, the size should be signed and * could only be positive. */ - rt_int16_t buffer_size; + rt_int32_t buffer_size; }; enum rt_ringbuffer_state @@ -65,19 +62,19 @@ enum rt_ringbuffer_state * Please note that the ring buffer implementation of RT-Thread * has no thread wait or resume feature. */ -void rt_ringbuffer_init(struct rt_ringbuffer *rb, rt_uint8_t *pool, rt_int16_t size); +void rt_ringbuffer_init(struct rt_ringbuffer *rb, rt_uint8_t *pool, rt_int32_t size); void rt_ringbuffer_reset(struct rt_ringbuffer *rb); -rt_size_t rt_ringbuffer_put(struct rt_ringbuffer *rb, const rt_uint8_t *ptr, rt_uint16_t length); -rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, const rt_uint8_t *ptr, rt_uint16_t length); +rt_size_t rt_ringbuffer_put(struct rt_ringbuffer *rb, const rt_uint8_t *ptr, rt_uint32_t length); +rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, const rt_uint8_t *ptr, rt_uint32_t length); rt_size_t rt_ringbuffer_putchar(struct rt_ringbuffer *rb, const rt_uint8_t ch); rt_size_t rt_ringbuffer_putchar_force(struct rt_ringbuffer *rb, const rt_uint8_t ch); -rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb, rt_uint8_t *ptr, rt_uint16_t length); +rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb, rt_uint8_t *ptr, rt_uint32_t length); rt_size_t rt_ringbuffer_peek(struct rt_ringbuffer *rb, rt_uint8_t **ptr); rt_size_t rt_ringbuffer_getchar(struct rt_ringbuffer *rb, rt_uint8_t *ch); rt_size_t rt_ringbuffer_data_len(struct rt_ringbuffer *rb); #ifdef RT_USING_HEAP -struct rt_ringbuffer* rt_ringbuffer_create(rt_uint16_t length); +struct rt_ringbuffer* rt_ringbuffer_create(rt_uint32_t length); void rt_ringbuffer_destroy(struct rt_ringbuffer *rb); #endif @@ -88,14 +85,14 @@ void rt_ringbuffer_destroy(struct rt_ringbuffer *rb); * * @return Buffer size. */ -rt_inline rt_uint16_t rt_ringbuffer_get_size(struct rt_ringbuffer *rb) +rt_inline rt_uint32_t rt_ringbuffer_get_size(struct rt_ringbuffer *rb) { RT_ASSERT(rb != RT_NULL); return rb->buffer_size; } /** return the size of empty space in rb */ -#define rt_ringbuffer_space_len(rb) ((rb)->buffer_size - (rt_int16_t)rt_ringbuffer_data_len(rb)) +#define rt_ringbuffer_space_len(rb) ((rb)->buffer_size - rt_ringbuffer_data_len(rb)) #ifdef __cplusplus diff --git a/components/drivers/ipc/ringbuffer.c b/components/drivers/ipc/ringbuffer.c index 90632f5884..3374b913b1 100644 --- a/components/drivers/ipc/ringbuffer.c +++ b/components/drivers/ipc/ringbuffer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2023, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -37,7 +37,7 @@ rt_inline enum rt_ringbuffer_state rt_ringbuffer_status(struct rt_ringbuffer *rb */ void rt_ringbuffer_init(struct rt_ringbuffer *rb, rt_uint8_t *pool, - rt_int16_t size) + rt_int32_t size) { RT_ASSERT(rb != RT_NULL); RT_ASSERT(size > 0); @@ -63,9 +63,9 @@ RTM_EXPORT(rt_ringbuffer_init); */ rt_size_t rt_ringbuffer_put(struct rt_ringbuffer *rb, const rt_uint8_t *ptr, - rt_uint16_t length) + rt_uint32_t length) { - rt_uint16_t size; + rt_uint32_t size; RT_ASSERT(rb != RT_NULL); @@ -116,9 +116,9 @@ RTM_EXPORT(rt_ringbuffer_put); */ rt_size_t rt_ringbuffer_put_force(struct rt_ringbuffer *rb, const rt_uint8_t *ptr, - rt_uint16_t length) + rt_uint32_t length) { - rt_uint16_t space_length; + rt_uint32_t space_length; RT_ASSERT(rb != RT_NULL); @@ -177,7 +177,7 @@ RTM_EXPORT(rt_ringbuffer_put_force); */ rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb, rt_uint8_t *ptr, - rt_uint16_t length) + rt_uint32_t length) { rt_size_t size; @@ -192,7 +192,7 @@ rt_size_t rt_ringbuffer_get(struct rt_ringbuffer *rb, /* less data */ if (size < length) - length = (rt_uint16_t)size; + length = size; if (rb->buffer_size - rb->read_index > length) { @@ -248,7 +248,7 @@ rt_size_t rt_ringbuffer_peek(struct rt_ringbuffer *rb, rt_uint8_t **ptr) if ((rt_size_t)(rb->buffer_size - rb->read_index) > size) { - rb->read_index += (rt_uint16_t)size; + rb->read_index += size; return size; } @@ -423,7 +423,7 @@ RTM_EXPORT(rt_ringbuffer_reset); * * @return Return a pointer to ring buffer object. When the return value is RT_NULL, it means this creation failed. */ -struct rt_ringbuffer *rt_ringbuffer_create(rt_uint16_t size) +struct rt_ringbuffer *rt_ringbuffer_create(rt_uint32_t size) { struct rt_ringbuffer *rb; rt_uint8_t *pool; |
