comparison src/http/ngx_http_cache.h @ 539:5f4de8cf0d9d

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 15 Sep 2009 03:43:40 +0400
parents 86dad910eeb6
children ff463db0be31
comparison
equal deleted inserted replaced
522:40fd8d7b82f9 539:5f4de8cf0d9d
16 #define NGX_HTTP_CACHE_MISS 1 16 #define NGX_HTTP_CACHE_MISS 1
17 #define NGX_HTTP_CACHE_EXPIRED 2 17 #define NGX_HTTP_CACHE_EXPIRED 2
18 #define NGX_HTTP_CACHE_STALE 3 18 #define NGX_HTTP_CACHE_STALE 3
19 #define NGX_HTTP_CACHE_UPDATING 4 19 #define NGX_HTTP_CACHE_UPDATING 4
20 #define NGX_HTTP_CACHE_HIT 5 20 #define NGX_HTTP_CACHE_HIT 5
21 #define NGX_HTTP_CACHE_SCARCE 6
21 22
22 #define NGX_HTTP_CACHE_KEY_LEN 16 23 #define NGX_HTTP_CACHE_KEY_LEN 16
23 24
24 25
25 typedef struct { 26 typedef struct {
95 typedef struct { 96 typedef struct {
96 ngx_rbtree_t rbtree; 97 ngx_rbtree_t rbtree;
97 ngx_rbtree_node_t sentinel; 98 ngx_rbtree_node_t sentinel;
98 ngx_queue_t queue; 99 ngx_queue_t queue;
99 ngx_atomic_t cold; 100 ngx_atomic_t cold;
101 ngx_atomic_t loading;
100 off_t size; 102 off_t size;
101 } ngx_http_file_cache_sh_t; 103 } ngx_http_file_cache_sh_t;
102 104
103 105
104 struct ngx_http_file_cache_s { 106 struct ngx_http_file_cache_s {