From f58d821a5ac305c963722997713c6fc35a4dc6f7 Mon Sep 17 00:00:00 2001 From: Gwendal Grignou Date: Sat, 30 May 2015 11:40:34 -0700 Subject: Queue: add peek_memcpy function Add queue_peek_memcpy to peek at queue and move the element using specific memcpy function. Also change memcpy prototype argument from void const * to const void*. BUG=none BRANCH=none TEST=Compile and use. Change-Id: I8c582563e7d204ee5568637f819d63404624faf6 Signed-off-by: Gwendal Grignou Reviewed-on: https://chromium-review.googlesource.com/274226 Reviewed-by: Vincent Palatin Reviewed-by: Bill Richardson Reviewed-by: Anton Staaf --- common/queue.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'common/queue.c') diff --git a/common/queue.c b/common/queue.c index 6e5e9e65ad..e289584a85 100644 --- a/common/queue.c +++ b/common/queue.c @@ -42,7 +42,7 @@ size_t queue_space(struct queue const *q) return q->buffer_units - queue_count(q); } -size_t queue_add_unit(struct queue const *q, void const *src) +size_t queue_add_unit(struct queue const *q, const void *src) { size_t tail = q->state->tail & (q->buffer_units - 1); @@ -61,16 +61,16 @@ size_t queue_add_unit(struct queue const *q, void const *src) return 1; } -size_t queue_add_units(struct queue const *q, void const *src, size_t count) +size_t queue_add_units(struct queue const *q, const void *src, size_t count) { return queue_add_memcpy(q, src, count, memcpy); } size_t queue_add_memcpy(struct queue const *q, - void const *src, + const void *src, size_t count, void *(*memcpy)(void *dest, - void const *src, + const void *src, size_t n)) { size_t transfer = MIN(count, queue_space(q)); @@ -98,7 +98,7 @@ static void queue_read_safe(struct queue const *q, size_t head, size_t transfer, void *(*memcpy)(void *dest, - void const *src, + const void *src, size_t n)) { size_t first = MIN(transfer, q->buffer_units - head); @@ -141,7 +141,7 @@ size_t queue_remove_memcpy(struct queue const *q, void *dest, size_t count, void *(*memcpy)(void *dest, - void const *src, + const void *src, size_t n)) { size_t transfer = MIN(count, queue_count(q)); @@ -160,6 +160,17 @@ size_t queue_peek_units(struct queue const *q, void *dest, size_t i, size_t count) +{ + return queue_peek_memcpy(q, dest, i, count, memcpy); +} + +size_t queue_peek_memcpy(struct queue const *q, + void *dest, + size_t i, + size_t count, + void *(*memcpy)(void *dest, + const void *src, + size_t n)) { size_t available = queue_count(q); size_t transfer = MIN(count, available - i); -- cgit v1.2.1