mirror of
https://github.com/nginx/nginx.git
synced 2024-12-03 21:18:59 +08:00
Core: changed ngx_queue_sort() to use merge sort.
This improves nginx startup times significantly when using very large number of locations due to computational complexity of the sorting algorithm being used: insertion sort is O(n*n) on average, while merge sort is O(n*log(n)). In particular, in a test configuration with 20k locations total startup time is reduced from 8 seconds to 0.9 seconds. Prodded by Yusuke Nojima, https://mailman.nginx.org/pipermail/nginx-devel/2023-September/NUL3Y2FPPFSHMPTFTL65KXSXNTX3NQMK.html
This commit is contained in:
parent
284a0c7377
commit
c93cb45ae3
@ -9,6 +9,10 @@
|
|||||||
#include <ngx_core.h>
|
#include <ngx_core.h>
|
||||||
|
|
||||||
|
|
||||||
|
static void ngx_queue_merge(ngx_queue_t *queue, ngx_queue_t *tail,
|
||||||
|
ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *));
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* find the middle queue element if the queue has odd number of elements
|
* find the middle queue element if the queue has odd number of elements
|
||||||
* or the first element of the queue's second part otherwise
|
* or the first element of the queue's second part otherwise
|
||||||
@ -45,13 +49,13 @@ ngx_queue_middle(ngx_queue_t *queue)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* the stable insertion sort */
|
/* the stable merge sort */
|
||||||
|
|
||||||
void
|
void
|
||||||
ngx_queue_sort(ngx_queue_t *queue,
|
ngx_queue_sort(ngx_queue_t *queue,
|
||||||
ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *))
|
ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *))
|
||||||
{
|
{
|
||||||
ngx_queue_t *q, *prev, *next;
|
ngx_queue_t *q, tail;
|
||||||
|
|
||||||
q = ngx_queue_head(queue);
|
q = ngx_queue_head(queue);
|
||||||
|
|
||||||
@ -59,22 +63,44 @@ ngx_queue_sort(ngx_queue_t *queue,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (q = ngx_queue_next(q); q != ngx_queue_sentinel(queue); q = next) {
|
q = ngx_queue_middle(queue);
|
||||||
|
|
||||||
prev = ngx_queue_prev(q);
|
ngx_queue_split(queue, q, &tail);
|
||||||
next = ngx_queue_next(q);
|
|
||||||
|
|
||||||
ngx_queue_remove(q);
|
ngx_queue_sort(queue, cmp);
|
||||||
|
ngx_queue_sort(&tail, cmp);
|
||||||
|
|
||||||
do {
|
ngx_queue_merge(queue, &tail, cmp);
|
||||||
if (cmp(prev, q) <= 0) {
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
prev = ngx_queue_prev(prev);
|
|
||||||
|
|
||||||
} while (prev != ngx_queue_sentinel(queue));
|
static void
|
||||||
|
ngx_queue_merge(ngx_queue_t *queue, ngx_queue_t *tail,
|
||||||
|
ngx_int_t (*cmp)(const ngx_queue_t *, const ngx_queue_t *))
|
||||||
|
{
|
||||||
|
ngx_queue_t *q1, *q2;
|
||||||
|
|
||||||
ngx_queue_insert_after(prev, q);
|
q1 = ngx_queue_head(queue);
|
||||||
|
q2 = ngx_queue_head(tail);
|
||||||
|
|
||||||
|
for ( ;; ) {
|
||||||
|
if (q1 == ngx_queue_sentinel(queue)) {
|
||||||
|
ngx_queue_add(queue, tail);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (q2 == ngx_queue_sentinel(tail)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cmp(q1, q2) <= 0) {
|
||||||
|
q1 = ngx_queue_next(q1);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
ngx_queue_remove(q2);
|
||||||
|
ngx_queue_insert_before(q1, q2);
|
||||||
|
|
||||||
|
q2 = ngx_queue_head(tail);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,6 +47,9 @@ struct ngx_queue_s {
|
|||||||
(h)->prev = x
|
(h)->prev = x
|
||||||
|
|
||||||
|
|
||||||
|
#define ngx_queue_insert_before ngx_queue_insert_tail
|
||||||
|
|
||||||
|
|
||||||
#define ngx_queue_head(h) \
|
#define ngx_queue_head(h) \
|
||||||
(h)->next
|
(h)->next
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user