walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Optimize pq

This commit is contained in:
Tatsuhiro Tsujikawa 2015-08-18 00:15:05 +09:00
parent 6a511aef0a
commit 71623b674e
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/nghttp2_pq.c
View File

@ -52,14 +52,14 @@ static void swap(nghttp2_pq *pq, size_t i, size_t j) {
}
static void bubble_up(nghttp2_pq *pq, size_t index) {
if (index == 0) {
size_t parent;
while (index != 0) {
parent = (index - 1) / 2;
if (!pq->less(pq->q[index], pq->q[parent])) {
return;
} else {
size_t parent = (index - 1) / 2;
if (pq->less(pq->q[index], pq->q[parent])) {
swap(pq, parent, index);
bubble_up(pq, parent);
}
swap(pq, parent, index);
index = parent;
}
}
@ -94,8 +94,10 @@ nghttp2_pq_entry *nghttp2_pq_top(nghttp2_pq *pq) {
}
static void bubble_down(nghttp2_pq *pq, size_t index) {
size_t i, j = index * 2 + 1;
size_t minindex = index;
size_t i, j, minindex;
for (;;) {
j = index * 2 + 1;
minindex = index;
for (i = 0; i < 2; ++i, ++j) {
if (j >= pq->length) {
break;
@ -104,9 +106,11 @@ static void bubble_down(nghttp2_pq *pq, size_t index) {
minindex = j;
}
}
if (minindex != index) {
if (minindex == index) {
return;
}
swap(pq, index, minindex);
bubble_down(pq, minindex);
index = minindex;
}
}
@ -122,6 +126,11 @@ void nghttp2_pq_pop(nghttp2_pq *pq) {
void nghttp2_pq_remove(nghttp2_pq *pq, nghttp2_pq_entry *item) {
assert(pq->q[item->index] == item);
if (item->index == 0) {
nghttp2_pq_pop(pq);
return;
}
if (item->index == pq->length - 1) {
--pq->length;
return;