Mercurial > hg > nginx
comparison src/core/ngx_rbtree.h @ 826:4390fcad6628
undo the previous wrong commit
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 28 Oct 2006 14:32:39 +0000 |
parents | f9b9b84a8e18 |
children | a7c8cbb4c55f |
comparison
equal
deleted
inserted
replaced
825:f9b9b84a8e18 | 826:4390fcad6628 |
---|---|
27 }; | 27 }; |
28 | 28 |
29 | 29 |
30 typedef struct ngx_rbtree_s ngx_rbtree_t; | 30 typedef struct ngx_rbtree_s ngx_rbtree_t; |
31 | 31 |
32 typedef void (*ngx_rbtree_insert_pt) (ngx_rbtree_node_t *root, | 32 typedef ngx_rbtree_node_t *(*ngx_rbtree_insert_pt) (ngx_rbtree_node_t *root, |
33 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); | 33 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); |
34 | 34 |
35 struct ngx_rbtree_s { | 35 struct ngx_rbtree_s { |
36 ngx_rbtree_node_t *root; | 36 ngx_rbtree_node_t *root; |
37 ngx_rbtree_node_t *sentinel; | 37 ngx_rbtree_node_t *sentinel; |
38 ngx_rbtree_insert_pt insert; | 38 /* ngx_rbtree_insert_pt insert; */ |
39 }; | 39 }; |
40 | 40 |
41 | 41 |
42 void ngx_rbtree_insert(ngx_thread_volatile ngx_rbtree_t *tree, | 42 void ngx_rbtree_insert(ngx_thread_volatile ngx_rbtree_t *tree, |
43 ngx_rbtree_node_t *node); | 43 ngx_rbtree_node_t *node); |
44 void ngx_rbtree_delete(ngx_thread_volatile ngx_rbtree_t *tree, | 44 void ngx_rbtree_delete(ngx_thread_volatile ngx_rbtree_t *tree, |
45 ngx_rbtree_node_t *node); | 45 ngx_rbtree_node_t *node); |
46 void ngx_rbtree_insert_timer_value(ngx_rbtree_node_t *root, | |
47 ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel); | |
48 | 46 |
49 | 47 |
50 static ngx_inline ngx_rbtree_node_t * | 48 static ngx_inline ngx_rbtree_node_t * |
51 ngx_rbtree_min(ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) | 49 ngx_rbtree_min(ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel) |
52 { | 50 { |