jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

opr: Don't confuse isLast and isEnd

Browse Source 
opr_queue_IsEnd's implementation was incorrect - it would return
true when the element was the last item in the list, not when it
was the end of the list (equal to the head record)

Correct the implementation of isEnd, and add an implementation for
isLast.

This fixes a bug in RX, wher we would never notice that the last
packet in the transmit queue was acknowledged, because the loop that
iterates over the queue uses isEnd to detect when its work is done.

Change-Id: I8966e05c479c18d025bb5cc4cf77514ce002be95
Reviewed-on: http://gerrit.openafs.org/8493
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
This commit is contained in:
Simon Wilkinson 2012-11-21 16:46:29 +00:00 committed by Derrick Brashear
parent ad4e634051
commit b28c51d594
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opr/queue.h
View File

@ -124,6 +124,11 @@ opr_queue_IsOnQueue(struct opr_queue *q) {
static_inline int
opr_queue_IsEnd(struct opr_queue *q, struct opr_queue *cursor) {
return (cursor == q);
}
static_inline int
opr_queue_IsLast(struct opr_queue *q, struct opr_queue *cursor) {
return (cursor->next == q);
}

10
tests/opr/queues-t.c
View File

@ -57,7 +57,7 @@ main(void)
{
struct opr_queue q1, q2, q3, q4, *cursor;
plan(17);
plan(20);
opr_queue_Init(&q1);
opr_queue_Init(&q2);
@ -136,5 +136,13 @@ main(void)
is_string("ABC", queueAsString(&q3), "Swap Q3");
is_string("123", queueAsString(&q4), "Swap Q4");
/* IsEnd and IsLast handling */
ok(opr_queue_IsLast(&q1, &(opr_queue_Last(&q1, struct charqueue, entry)->entry)),
"IsLast is true for last element of a list");
ok(opr_queue_IsEnd(&q1,
opr_queue_Last(&q1, struct charqueue, entry)->entry.next),
"IsEnd is true for entry after last element");
ok(opr_queue_IsEnd(&q1, &q1), "IsEnd is true for queue head");
return 0;
}