1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
Source: https://trac.nginx.org/nginx/changeset/3038bd4d78169a5e8a2624d79cf76f45f0805ddc/nginx
This patch was modified from upstream in the following way(s):
* Update path so that the patch applies correctly
* dos2unix
Index: src/core/ngx_queue.c
===================================================================
--- a/src/core/ngx_queue.c (revision 4412)
+++ b/src/core/ngx_queue.c (revision 9167)
@@ -8,4 +8,8 @@
#include <ngx_config.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 *));
@@ -46,5 +50,5 @@
-/* the stable insertion sort */
+/* the stable merge sort */
void
@@ -52,5 +56,5 @@
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);
@@ -60,21 +64,43 @@
}
- for (q = ngx_queue_next(q); q != ngx_queue_sentinel(queue); q = next) {
+ q = ngx_queue_middle(queue);
- prev = ngx_queue_prev(q);
- next = ngx_queue_next(q);
+ ngx_queue_split(queue, q, &tail);
- ngx_queue_remove(q);
+ ngx_queue_sort(queue, cmp);
+ ngx_queue_sort(&tail, cmp);
- do {
- if (cmp(prev, q) <= 0) {
- break;
- }
+ ngx_queue_merge(queue, &tail, cmp);
+}
- 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);
}
}
Index: src/core/ngx_queue.h
===================================================================
--- a/src/core/ngx_queue.h (revision 4412)
+++ b/src/core/ngx_queue.h (revision 9167)
@@ -46,4 +46,7 @@
(x)->next = h; \
(h)->prev = x
+
+
+#define ngx_queue_insert_before ngx_queue_insert_tail
|
