Mercurial > hg > nginx

changeset 1761:1c4b231ba90c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
embed sentinel
author Igor Sysoev <igor@sysoev.ru>
date Thu, 20 Dec 2007 21:29:52 +0000
parents 49429f5b2d94
children 7806f453183e
files src/core/ngx_open_file_cache.c src/core/ngx_open_file_cache.h
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -33,7 +33,6 @@ static void ngx_open_file_cache_remove(n
 ngx_open_file_cache_t *
 ngx_open_file_cache_init(ngx_pool_t *pool, ngx_uint_t max, time_t inactive)
 {
-    ngx_rbtree_node_t      *sentinel;
     ngx_pool_cleanup_t     *cln;
     ngx_open_file_cache_t  *cache;
 
@@ -48,12 +47,7 @@ ngx_open_file_cache_init(ngx_pool_t *poo
     cache->list_tail.prev = &cache->list_head;
     cache->list_tail.next = NULL;
 
-    sentinel = ngx_palloc(pool, sizeof(ngx_rbtree_node_t));
-    if (sentinel == NULL) {
-        return NULL;
-    }
-
-    ngx_rbtree_init(&cache->rbtree, sentinel,
+    ngx_rbtree_init(&cache->rbtree, &cache->sentinel,
                     ngx_open_file_cache_rbtree_insert_value);
 
     cache->current = 0;
--- a/src/core/ngx_open_file_cache.h
+++ b/src/core/ngx_open_file_cache.h
@@ -63,6 +63,7 @@ struct ngx_cached_open_file_s {
 
 typedef struct {
     ngx_rbtree_t             rbtree;
+    ngx_rbtree_node_t        sentinel;
     ngx_cached_open_file_t   list_head;
     ngx_cached_open_file_t   list_tail;