# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1198182923 0
# Node ID 89234cfbf8109695d1dd4cae1b3a178314769d6b
# Parent  34e88556c15e1bc0d67c2fd67c1c30674a2df854
embed session_rbtree and sentinel inside ngx_ssl_session_cache_t

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1217,7 +1217,6 @@ static ngx_int_t
 ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data)
 {
     ngx_slab_pool_t          *shpool;
-    ngx_rbtree_node_t        *sentinel;
     ngx_ssl_session_cache_t  *cache;
 
     if (data) {
@@ -1232,25 +1231,15 @@ ngx_ssl_session_cache_init(ngx_shm_zone_
         return NGX_ERROR;
     }
 
+    ngx_rbtree_init(&cache->session_rbtree, &cache->sentinel,
+                    ngx_ssl_session_rbtree_insert_value);
+
     cache->session_cache_head.prev = NULL;
     cache->session_cache_head.next = &cache->session_cache_tail;
 
     cache->session_cache_tail.prev = &cache->session_cache_head;
     cache->session_cache_tail.next = NULL;
 
-    cache->session_rbtree = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_t));
-    if (cache->session_rbtree == NULL) {
-        return NGX_ERROR;
-    }
-
-    sentinel = ngx_slab_alloc(shpool, sizeof(ngx_rbtree_node_t));
-    if (sentinel == NULL) {
-        return NGX_ERROR;
-    }
-
-    ngx_rbtree_init(cache->session_rbtree, sentinel,
-                    ngx_ssl_session_rbtree_insert_value);
-
     shm_zone->data = cache;
 
     return NGX_OK;
@@ -1369,7 +1358,7 @@ ngx_ssl_new_session(ngx_ssl_conn_t *ssl_
     sess_id->prev = &cache->session_cache_head;
     cache->session_cache_head.next = sess_id;
 
-    ngx_rbtree_insert(cache->session_rbtree, &sess_id->node);
+    ngx_rbtree_insert(&cache->session_rbtree, &sess_id->node);
 
     ngx_shmtx_unlock(&shpool->mutex);
 
@@ -1432,8 +1421,8 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_
 
     ngx_shmtx_lock(&shpool->mutex);
 
-    node = cache->session_rbtree->root;
-    sentinel = cache->session_rbtree->sentinel;
+    node = cache->session_rbtree.root;
+    sentinel = cache->session_rbtree.sentinel;
 
     while (node != sentinel) {
 
@@ -1470,7 +1459,7 @@ ngx_ssl_get_cached_session(ngx_ssl_conn_
                 sess_id->next->prev = sess_id->prev;
                 sess_id->prev->next = sess_id->next;
 
-                ngx_rbtree_delete(cache->session_rbtree, node);
+                ngx_rbtree_delete(&cache->session_rbtree, node);
 
                 ngx_slab_free_locked(shpool, sess_id->session);
 #if (NGX_PTR_SIZE == 4)
@@ -1527,8 +1516,8 @@ ngx_ssl_remove_session(SSL_CTX *ssl, ngx
 
     ngx_shmtx_lock(&shpool->mutex);
 
-    node = cache->session_rbtree->root;
-    sentinel = cache->session_rbtree->sentinel;
+    node = cache->session_rbtree.root;
+    sentinel = cache->session_rbtree.sentinel;
 
     while (node != sentinel) {
 
@@ -1553,7 +1542,7 @@ ngx_ssl_remove_session(SSL_CTX *ssl, ngx
                 sess_id->next->prev = sess_id->prev;
                 sess_id->prev->next = sess_id->next;
 
-                ngx_rbtree_delete(cache->session_rbtree, node);
+                ngx_rbtree_delete(&cache->session_rbtree, node);
 
                 ngx_slab_free_locked(shpool, sess_id->session);
 #if (NGX_PTR_SIZE == 4)
@@ -1601,7 +1590,7 @@ ngx_ssl_expire_sessions(ngx_ssl_session_
         sess_id->next->prev = sess_id->prev;
         sess_id->prev->next = sess_id->next;
 
-        ngx_rbtree_delete(cache->session_rbtree, &sess_id->node);
+        ngx_rbtree_delete(&cache->session_rbtree, &sess_id->node);
 
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
                        "expire session: %08Xi", sess_id->node.key);
diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
--- a/src/event/ngx_event_openssl.h
+++ b/src/event/ngx_event_openssl.h
@@ -75,7 +75,8 @@ struct ngx_ssl_sess_id_s {
 
 
 typedef struct {
-    ngx_rbtree_t               *session_rbtree;
+    ngx_rbtree_t                session_rbtree;
+    ngx_rbtree_node_t           sentinel;
     ngx_ssl_sess_id_t           session_cache_head;
     ngx_ssl_sess_id_t           session_cache_tail;
 } ngx_ssl_session_cache_t;