nginx: src/http/ngx_http_file

annotate src/http/ngx_http_file_cache.c @ 5879:c525c0454aa5

Cache: c->reading flag introduced. It replaces c->buf in checks in ngx_http_file_cache_open(), making it possible to reopen the file without clearing c->buf. No functional changes.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Mon, 27 Oct 2014 21:14:07 +0300
parents	2c89956b6a76
children	78c49e243848

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 265 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 265 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 4387 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 265 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 265 diff changeset	6
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_http.h>
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	11 #include <ngx_md5.h>
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	13
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	14 static ngx_int_t ngx_http_file_cache_lock(ngx_http_request_t *r,
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	15 ngx_http_cache_t *c);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	16 static void ngx_http_file_cache_lock_wait_handler(ngx_event_t *ev);
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	17 static ngx_int_t ngx_http_file_cache_read(ngx_http_request_t *r,
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	18 ngx_http_cache_t *c);
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	19 static ssize_t ngx_http_file_cache_aio_read(ngx_http_request_t *r,
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	20 ngx_http_cache_t *c);
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	21 #if (NGX_HAVE_FILE_AIO)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	22 static void ngx_http_cache_aio_event_handler(ngx_event_t *ev);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	23 #endif
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	24 static ngx_int_t ngx_http_file_cache_exists(ngx_http_file_cache_t *cache,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	25 ngx_http_cache_t *c);
3696 29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	26 static ngx_int_t ngx_http_file_cache_name(ngx_http_request_t *r,
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	27 ngx_path_t *path);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	28 static ngx_http_file_cache_node_t *
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	29 ngx_http_file_cache_lookup(ngx_http_file_cache_t cache, u_char key);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	30 static void ngx_http_file_cache_rbtree_insert_value(ngx_rbtree_node_t *temp,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	31 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel);
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	32 static void ngx_http_file_cache_vary(ngx_http_request_t r, u_char vary,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	33 size_t len, u_char *hash);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	34 static void ngx_http_file_cache_vary_header(ngx_http_request_t *r,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	35 ngx_md5_t md5, ngx_str_t name);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	36 static void ngx_http_file_cache_cleanup(void *data);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	37 static time_t ngx_http_file_cache_forced_expire(ngx_http_file_cache_t *cache);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	38 static time_t ngx_http_file_cache_expire(ngx_http_file_cache_t *cache);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	39 static void ngx_http_file_cache_delete(ngx_http_file_cache_t *cache,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	40 ngx_queue_t q, u_char name);
4018 5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	41 static void ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	42 static ngx_int_t ngx_http_file_cache_noop(ngx_tree_ctx_t *ctx,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	43 ngx_str_t *path);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	44 static ngx_int_t ngx_http_file_cache_manage_file(ngx_tree_ctx_t *ctx,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	45 ngx_str_t *path);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	46 static ngx_int_t ngx_http_file_cache_add_file(ngx_tree_ctx_t *ctx,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	47 ngx_str_t *path);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	48 static ngx_int_t ngx_http_file_cache_add(ngx_http_file_cache_t *cache,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	49 ngx_http_cache_t *c);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	50 static ngx_int_t ngx_http_file_cache_delete_file(ngx_tree_ctx_t *ctx,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	51 ngx_str_t *path);
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	52
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	53
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	54 ngx_str_t ngx_http_cache_status[] = {
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	55 ngx_string("MISS"),
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	56 ngx_string("BYPASS"),
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	57 ngx_string("EXPIRED"),
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	58 ngx_string("STALE"),
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	59 ngx_string("UPDATING"),
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	60 ngx_string("REVALIDATED"),
2952 0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	61 ngx_string("HIT")
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	62 };
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	63
0998606fbfd4 $upstream_cache_status Igor Sysoev <igor@sysoev.ru> parents: 2935 diff changeset	64
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	65 static u_char ngx_http_file_cache_key[] = { LF, 'K', 'E', 'Y', ':', ' ' };
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	66
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	67
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	68 static ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	69 ngx_http_file_cache_init(ngx_shm_zone_t shm_zone, void data)
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	70 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	71 ngx_http_file_cache_t *ocache = data;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	72
2611 2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	73 size_t len;
3017 c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	74 ngx_uint_t n;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	75 ngx_http_file_cache_t *cache;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	76
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	77 cache = shm_zone->data;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	78
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	79 if (ocache) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	80 if (ngx_strcmp(cache->path->name.data, ocache->path->name.data) != 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	81 ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	82 "cache \"%V\" uses the \"%V\" cache path "
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	83 "while previously it used the \"%V\" cache path",
2716 d5896f6608e8 move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2694 diff changeset	84 &shm_zone->shm.name, &cache->path->name,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	85 &ocache->path->name);
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	86
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	87 return NGX_ERROR;
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	89
3017 c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	90 for (n = 0; n < 3; n++) {
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	91 if (cache->path->level[n] != ocache->path->level[n]) {
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	92 ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0,
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	93 "cache \"%V\" had previously different levels",
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	94 &shm_zone->shm.name);
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	95 return NGX_ERROR;
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	96 }
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	97 }
c466605d9426 test cache path levels while reconfiguration Igor Sysoev <igor@sysoev.ru> parents: 2952 diff changeset	98
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	99 cache->sh = ocache->sh;
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	100
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	101 cache->shpool = ocache->shpool;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	102 cache->bsize = ocache->bsize;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	103
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	104 cache->max_size /= cache->bsize;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	105
3018 8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	106 if (!cache->sh->cold \|\| cache->sh->loading) {
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	107 cache->path->loader = NULL;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	108 }
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	109
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	110 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	111 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	112
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	113 cache->shpool = (ngx_slab_pool_t *) shm_zone->shm.addr;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	114
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	115 if (shm_zone->shm.exists) {
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	116 cache->sh = cache->shpool->data;
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	117 cache->bsize = ngx_fs_bsize(cache->path->name.data);
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	118
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	119 return NGX_OK;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	120 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	121
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	122 cache->sh = ngx_slab_alloc(cache->shpool, sizeof(ngx_http_file_cache_sh_t));
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	123 if (cache->sh == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	124 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	125 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	126
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	127 cache->shpool->data = cache->sh;
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	128
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	129 ngx_rbtree_init(&cache->sh->rbtree, &cache->sh->sentinel,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	130 ngx_http_file_cache_rbtree_insert_value);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	131
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	132 ngx_queue_init(&cache->sh->queue);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	133
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	134 cache->sh->cold = 1;
3018 8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	135 cache->sh->loading = 0;
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	136 cache->sh->size = 0;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	137
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	138 cache->bsize = ngx_fs_bsize(cache->path->name.data);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	139
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	140 cache->max_size /= cache->bsize;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	141
2716 d5896f6608e8 move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2694 diff changeset	142 len = sizeof(" in cache keys zone \"\"") + shm_zone->shm.name.len;
2611 2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	143
2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	144 cache->shpool->log_ctx = ngx_slab_alloc(cache->shpool, len);
2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	145 if (cache->shpool->log_ctx == NULL) {
2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	146 return NGX_ERROR;
2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	147 }
2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	148
2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	149 ngx_sprintf(cache->shpool->log_ctx, " in cache keys zone \"%V\"%Z",
2716 d5896f6608e8 move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2694 diff changeset	150 &shm_zone->shm.name);
2611 2bce3f6416c6 improve ngx_slab_alloc() error logging Igor Sysoev <igor@sysoev.ru> parents: 2606 diff changeset	151
5822 063f7e75f9ef Upstream: suppressed the file cache slab allocator error messages. Roman Arutyunyan <arut@nginx.com> parents: 5737 diff changeset	152 cache->shpool->log_nomem = 0;
063f7e75f9ef Upstream: suppressed the file cache slab allocator error messages. Roman Arutyunyan <arut@nginx.com> parents: 5737 diff changeset	153
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	154 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	155 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	156
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	157
3697 3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	158 ngx_int_t
3698 d11227f0107f rename ngx_http_file_cache_create() to ngx_http_file_cache_new() Igor Sysoev <igor@sysoev.ru> parents: 3697 diff changeset	159 ngx_http_file_cache_new(ngx_http_request_t *r)
3697 3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	160 {
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	161 ngx_http_cache_t *c;
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	162
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	163 c = ngx_pcalloc(r->pool, sizeof(ngx_http_cache_t));
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	164 if (c == NULL) {
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	165 return NGX_ERROR;
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	166 }
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	167
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	168 if (ngx_array_init(&c->keys, r->pool, 4, sizeof(ngx_str_t)) != NGX_OK) {
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	169 return NGX_ERROR;
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	170 }
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	171
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	172 r->cache = c;
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	173 c->file.log = r->connection->log;
3704 f220e5a5fb5e initialize r->cache->file.fd with NGX_INVALID_FILE Igor Sysoev <igor@sysoev.ru> parents: 3699 diff changeset	174 c->file.fd = NGX_INVALID_FILE;
3697 3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	175
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	176 return NGX_OK;
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	177 }
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	178
3c442bd5597b ngx_http_file_cache_create() Igor Sysoev <igor@sysoev.ru> parents: 3696 diff changeset	179
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	180 ngx_int_t
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	181 ngx_http_file_cache_create(ngx_http_request_t *r)
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	182 {
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	183 ngx_http_cache_t *c;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	184 ngx_pool_cleanup_t *cln;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	185 ngx_http_file_cache_t *cache;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	186
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	187 c = r->cache;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	188 cache = c->file_cache;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	189
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	190 cln = ngx_pool_cleanup_add(r->pool, 0);
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	191 if (cln == NULL) {
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	192 return NGX_ERROR;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	193 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	194
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	195 cln->handler = ngx_http_file_cache_cleanup;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	196 cln->data = c;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	197
3699 b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	198 if (ngx_http_file_cache_exists(cache, c) == NGX_ERROR) {
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	199 return NGX_ERROR;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	200 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	201
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	202 if (ngx_http_file_cache_name(r, cache->path) != NGX_OK) {
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	203 return NGX_ERROR;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	204 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	205
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	206 return NGX_OK;
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	207 }
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	208
b0a0686a85bb proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass Igor Sysoev <igor@sysoev.ru> parents: 3698 diff changeset	209
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	210 void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	211 ngx_http_file_cache_create_key(ngx_http_request_t *r)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	212 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	213 size_t len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	214 ngx_str_t *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	215 ngx_uint_t i;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	216 ngx_md5_t md5;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	217 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	218
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	219 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	220
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	221 len = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	222
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	223 ngx_crc32_init(c->crc32);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	224 ngx_md5_init(&md5);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	225
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	226 key = c->keys.elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	227 for (i = 0; i < c->keys.nelts; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	228 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	229 "http cache key: \"%V\"", &key[i]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	230
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	231 len += key[i].len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	232
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	233 ngx_crc32_update(&c->crc32, key[i].data, key[i].len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	234 ngx_md5_update(&md5, key[i].data, key[i].len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	235 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	236
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	237 c->header_start = sizeof(ngx_http_file_cache_header_t)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	238 + sizeof(ngx_http_file_cache_key) + len + 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	239
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	240 ngx_crc32_final(c->crc32);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	241 ngx_md5_final(c->key, &md5);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	242 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	243
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	244
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	245 ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	246 ngx_http_file_cache_open(ngx_http_request_t *r)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	247 {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	248 ngx_int_t rc, rv;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	249 ngx_uint_t cold, test;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	250 ngx_http_cache_t *c;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	251 ngx_pool_cleanup_t *cln;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	252 ngx_open_file_info_t of;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	253 ngx_http_file_cache_t *cache;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	254 ngx_http_core_loc_conf_t *clcf;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	255
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	256 c = r->cache;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	257
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	258 if (c->waiting) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	259 return NGX_AGAIN;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	260 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	261
5879 c525c0454aa5 Cache: c->reading flag introduced. Maxim Dounin <mdounin@mdounin.ru> parents: 5878 diff changeset	262 if (c->reading) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	263 return ngx_http_file_cache_read(r, c);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	264 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	265
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	266 cache = c->file_cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	267
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	268 if (c->node == NULL) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	269 cln = ngx_pool_cleanup_add(r->pool, 0);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	270 if (cln == NULL) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	271 return NGX_ERROR;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	272 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	273
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	274 cln->handler = ngx_http_file_cache_cleanup;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	275 cln->data = c;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	276 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	277
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	278 rc = ngx_http_file_cache_exists(cache, c);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	279
2926 80a314b63c56 delete useless r->cache->uses Igor Sysoev <igor@sysoev.ru> parents: 2925 diff changeset	280 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
80a314b63c56 delete useless r->cache->uses Igor Sysoev <igor@sysoev.ru> parents: 2925 diff changeset	281 "http file cache exists: %i e:%d", rc, c->exists);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	282
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	283 if (rc == NGX_ERROR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	284 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	285 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	286
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	287 if (rc == NGX_AGAIN) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	288 return NGX_HTTP_CACHE_SCARCE;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	289 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	290
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	291 cold = cache->sh->cold;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	292
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	293 if (rc == NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	294
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	295 if (c->error) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	296 return c->error;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	297 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	298
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	299 c->temp_file = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	300 test = c->exists ? 1 : 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	301 rv = NGX_DECLINED;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	302
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	303 } else { /* rc == NGX_DECLINED */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	304
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	305 if (c->min_uses > 1) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	306
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	307 if (!cold) {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	308 return NGX_HTTP_CACHE_SCARCE;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	309 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	310
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	311 test = 1;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	312 rv = NGX_HTTP_CACHE_SCARCE;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	313
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	314 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	315 c->temp_file = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	316 test = cold ? 1 : 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	317 rv = NGX_DECLINED;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	318 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	319 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	320
3696 29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	321 if (ngx_http_file_cache_name(r, cache->path) != NGX_OK) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	322 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	323 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	324
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	325 if (!test) {
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	326 goto done;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	327 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	328
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	329 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	330
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	331 ngx_memzero(&of, sizeof(ngx_open_file_info_t));
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	332
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	333 of.uniq = c->uniq;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	334 of.valid = clcf->open_file_cache_valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	335 of.min_uses = clcf->open_file_cache_min_uses;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	336 of.events = clcf->open_file_cache_events;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	337 of.directio = NGX_OPEN_FILE_DIRECTIO_OFF;
3178 975f0558aab3 read_ahead Igor Sysoev <igor@sysoev.ru> parents: 3136 diff changeset	338 of.read_ahead = clcf->read_ahead;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	339
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	340 if (ngx_open_cached_file(clcf->open_file_cache, &c->file.name, &of, r->pool)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	341 != NGX_OK)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	342 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	343 switch (of.err) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	344
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	345 case 0:
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	346 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	347
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	348 case NGX_ENOENT:
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	349 case NGX_ENOTDIR:
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	350 goto done;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	351
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	352 default:
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	353 ngx_log_error(NGX_LOG_CRIT, r->connection->log, of.err,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	354 ngx_open_file_n " \"%s\" failed", c->file.name.data);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	355 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	356 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	357 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	358
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	359 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	360 "http file cache fd: %d", of.fd);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	361
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	362 c->file.fd = of.fd;
2603 f9bd7999eb08 fix segfault if ngx_read_file() will fail Igor Sysoev <igor@sysoev.ru> parents: 2600 diff changeset	363 c->file.log = r->connection->log;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	364 c->uniq = of.uniq;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	365 c->length = of.size;
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	366 c->fs_size = (of.fs_size + cache->bsize - 1) / cache->bsize;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	367
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	368 c->buf = ngx_create_temp_buf(r->pool, c->body_start);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	369 if (c->buf == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	370 return NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	371 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	372
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	373 return ngx_http_file_cache_read(r, c);
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	374
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	375 done:
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	376
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	377 if (rv == NGX_DECLINED) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	378 return ngx_http_file_cache_lock(r, c);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	379 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	380
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	381 return rv;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	382 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	383
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	384
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	385 static ngx_int_t
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	386 ngx_http_file_cache_lock(ngx_http_request_t r, ngx_http_cache_t c)
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	387 {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	388 ngx_msec_t now, timer;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	389 ngx_http_file_cache_t *cache;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	390
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	391 if (!c->lock) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	392 return NGX_DECLINED;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	393 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	394
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	395 cache = c->file_cache;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	396
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	397 ngx_shmtx_lock(&cache->shpool->mutex);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	398
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	399 if (!c->node->updating) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	400 c->node->updating = 1;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	401 c->updating = 1;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	402 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	403
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	404 ngx_shmtx_unlock(&cache->shpool->mutex);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	405
4387 e8181eeddaf8 Fixed build without debug. Maxim Dounin <mdounin@mdounin.ru> parents: 4385 diff changeset	406 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	407 "http file cache lock u:%d wt:%M",
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	408 c->updating, c->wait_time);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	409
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	410 if (c->updating) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	411 return NGX_DECLINED;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	412 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	413
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	414 c->waiting = 1;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	415
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	416 now = ngx_current_msec;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	417
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	418 if (c->wait_time == 0) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	419 c->wait_time = now + c->lock_timeout;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	420
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	421 c->wait_event.handler = ngx_http_file_cache_lock_wait_handler;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	422 c->wait_event.data = r;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	423 c->wait_event.log = r->connection->log;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	424 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	425
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	426 timer = c->wait_time - now;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	427
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	428 ngx_add_timer(&c->wait_event, (timer > 500) ? 500 : timer);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	429
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	430 r->main->blocked++;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	431
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	432 return NGX_AGAIN;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	433 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	434
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	435
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	436 static void
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	437 ngx_http_file_cache_lock_wait_handler(ngx_event_t *ev)
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	438 {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	439 ngx_uint_t wait;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	440 ngx_msec_t timer;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	441 ngx_http_cache_t *c;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	442 ngx_http_request_t *r;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	443 ngx_http_file_cache_t *cache;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	444
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	445 r = ev->data;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	446 c = r->cache;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	447
4387 e8181eeddaf8 Fixed build without debug. Maxim Dounin <mdounin@mdounin.ru> parents: 4385 diff changeset	448 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ev->log, 0,
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	449 "http file cache wait handler wt:%M cur:%M",
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	450 c->wait_time, ngx_current_msec);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	451
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	452 timer = c->wait_time - ngx_current_msec;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	453
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	454 if ((ngx_msec_int_t) timer <= 0) {
5341 654c1631dc86 Cache: lock timeouts are now logged at info level. Maxim Dounin <mdounin@mdounin.ru> parents: 5330 diff changeset	455 ngx_log_error(NGX_LOG_INFO, ev->log, 0, "cache lock timeout");
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	456 c->lock = 0;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	457 goto wakeup;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	458 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	459
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	460 cache = c->file_cache;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	461 wait = 0;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	462
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	463 ngx_shmtx_lock(&cache->shpool->mutex);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	464
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	465 if (c->node->updating) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	466 wait = 1;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	467 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	468
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	469 ngx_shmtx_unlock(&cache->shpool->mutex);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	470
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	471 if (wait) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	472 ngx_add_timer(ev, (timer > 500) ? 500 : timer);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	473 return;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	474 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	475
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	476 wakeup:
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	477
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	478 c->waiting = 0;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	479 r->main->blocked--;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	480 r->connection->write->handler(r->connection->write);
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	481 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	482
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	483
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	484 static ngx_int_t
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	485 ngx_http_file_cache_read(ngx_http_request_t r, ngx_http_cache_t c)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	486 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	487 time_t now;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	488 ssize_t n;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	489 ngx_int_t rc;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	490 ngx_http_file_cache_t *cache;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	491 ngx_http_file_cache_header_t *h;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	492
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	493 n = ngx_http_file_cache_aio_read(r, c);
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	494
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	495 if (n < 0) {
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	496 return n;
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	497 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	498
3369 479468a7d982 fix handling cached HTTP/0.9 response Igor Sysoev <igor@sysoev.ru> parents: 3294 diff changeset	499 if ((size_t) n < c->header_start) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	500 ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	501 "cache file \"%s\" is too small", c->file.name.data);
3971 44f4fc874b2f do not close connection if cache file is too small: replace it with valid one Igor Sysoev <igor@sysoev.ru> parents: 3970 diff changeset	502 return NGX_DECLINED;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	503 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	504
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	505 h = (ngx_http_file_cache_header_t *) c->buf->pos;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	506
5736 2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	507 if (h->version != NGX_HTTP_CACHE_VERSION) {
2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	508 ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	509 "cache file \"%s\" version mismatch", c->file.name.data);
2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	510 return NGX_DECLINED;
2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	511 }
2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	512
3460 bbea0b19b608 fix cached FastCGI response with large stderr output before header Igor Sysoev <igor@sysoev.ru> parents: 3400 diff changeset	513 if (h->crc32 != c->crc32) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	514 ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	515 "cache file \"%s\" has md5 collision", c->file.name.data);
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	516 return NGX_DECLINED;
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	517 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	518
5359 2fda9065d0f4 Win32: Borland C compatibility fixes. Maxim Dounin <mdounin@mdounin.ru> parents: 5341 diff changeset	519 if ((size_t) h->body_start > c->body_start) {
4339 6f97afc238de Cache: handling of cache files with long headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4338 diff changeset	520 ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
6f97afc238de Cache: handling of cache files with long headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4338 diff changeset	521 "cache file \"%s\" has too long header",
6f97afc238de Cache: handling of cache files with long headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4338 diff changeset	522 c->file.name.data);
6f97afc238de Cache: handling of cache files with long headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4338 diff changeset	523 return NGX_DECLINED;
6f97afc238de Cache: handling of cache files with long headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4338 diff changeset	524 }
6f97afc238de Cache: handling of cache files with long headers. Maxim Dounin <mdounin@mdounin.ru> parents: 4338 diff changeset	525
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	526 if (h->vary_len > NGX_HTTP_CACHE_VARY_LEN) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	527 ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	528 "cache file \"%s\" has incorrect vary length",
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	529 c->file.name.data);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	530 return NGX_DECLINED;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	531 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	532
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	533 if (h->vary_len) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	534 ngx_http_file_cache_vary(r, h->vary, h->vary_len, c->variant);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	535
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	536 if (ngx_memcmp(c->variant, h->variant, NGX_HTTP_CACHE_KEY_LEN) != 0) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	537 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	538 "http file cache vary mismatch");
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	539 return NGX_DECLINED;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	540 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	541 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	542
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	543 c->buf->last += n;
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	544
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	545 c->valid_sec = h->valid_sec;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	546 c->last_modified = h->last_modified;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	547 c->date = h->date;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	548 c->valid_msec = h->valid_msec;
3460 bbea0b19b608 fix cached FastCGI response with large stderr output before header Igor Sysoev <igor@sysoev.ru> parents: 3400 diff changeset	549 c->header_start = h->header_start;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	550 c->body_start = h->body_start;
5737 44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	551 c->etag.len = h->etag_len;
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	552 c->etag.data = h->etag;
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	553
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	554 r->cached = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	555
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	556 cache = c->file_cache;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	557
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	558 if (cache->sh->cold) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	559
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	560 ngx_shmtx_lock(&cache->shpool->mutex);
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	561
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	562 if (!c->node->exists) {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	563 c->node->uses = 1;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	564 c->node->body_start = c->body_start;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	565 c->node->exists = 1;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	566 c->node->uniq = c->uniq;
4034 e2c075e774b6 Cache size accounting fix: actual cache size on disk was less than Igor Sysoev <igor@sysoev.ru> parents: 4018 diff changeset	567 c->node->fs_size = c->fs_size;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	568
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	569 cache->sh->size += c->fs_size;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	570 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	571
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	572 ngx_shmtx_unlock(&cache->shpool->mutex);
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	573 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	574
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	575 now = ngx_time();
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	576
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	577 if (c->valid_sec < now) {
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	578
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	579 ngx_shmtx_lock(&cache->shpool->mutex);
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	580
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	581 if (c->node->updating) {
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	582 rc = NGX_HTTP_CACHE_UPDATING;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	583
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	584 } else {
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	585 c->node->updating = 1;
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	586 c->updating = 1;
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	587 rc = NGX_HTTP_CACHE_STALE;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	588 }
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	589
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	590 ngx_shmtx_unlock(&cache->shpool->mutex);
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	591
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	592 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	593 "http file cache expired: %i %T %T",
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	594 rc, c->valid_sec, now);
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	595
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	596 return rc;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	597 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	598
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	599 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	600 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	601
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	602
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	603 static ssize_t
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	604 ngx_http_file_cache_aio_read(ngx_http_request_t r, ngx_http_cache_t c)
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	605 {
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	606 #if (NGX_HAVE_FILE_AIO)
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	607 ssize_t n;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	608 ngx_http_core_loc_conf_t *clcf;
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	609
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	610 if (!ngx_file_aio) {
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	611 goto noaio;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	612 }
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	613
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	614 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	615
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	616 if (!clcf->aio) {
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	617 goto noaio;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	618 }
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	619
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	620 n = ngx_file_aio_read(&c->file, c->buf->pos, c->body_start, 0, r->pool);
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	621
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	622 if (n != NGX_AGAIN) {
5879 c525c0454aa5 Cache: c->reading flag introduced. Maxim Dounin <mdounin@mdounin.ru> parents: 5878 diff changeset	623 c->reading = 0;
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	624 return n;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	625 }
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	626
5879 c525c0454aa5 Cache: c->reading flag introduced. Maxim Dounin <mdounin@mdounin.ru> parents: 5878 diff changeset	627 c->reading = 1;
c525c0454aa5 Cache: c->reading flag introduced. Maxim Dounin <mdounin@mdounin.ru> parents: 5878 diff changeset	628
3294 04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	629 c->file.aio->data = r;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	630 c->file.aio->handler = ngx_http_cache_aio_event_handler;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	631
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	632 r->main->blocked++;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	633 r->aio = 1;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	634
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	635 return NGX_AGAIN;
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	636
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	637 noaio:
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	638
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	639 #endif
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	640
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	641 return ngx_read_file(&c->file, c->buf->pos, c->body_start, 0);
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	642 }
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	643
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	644
04cfc09b8b8d export aio presence knowledge to prevent using "aio sendfile", Igor Sysoev <igor@sysoev.ru> parents: 3195 diff changeset	645 #if (NGX_HAVE_FILE_AIO)
3052 6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	646
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	647 static void
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	648 ngx_http_cache_aio_event_handler(ngx_event_t *ev)
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	649 {
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	650 ngx_event_aio_t *aio;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	651 ngx_http_request_t *r;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	652
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	653 aio = ev->data;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	654 r = aio->data;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	655
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	656 r->main->blocked--;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	657 r->aio = 0;
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	658
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	659 r->connection->write->handler(r->connection->write);
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	660 }
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	661
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	662 #endif
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	663
6060225e9261 FreeBSD and Linux AIO support Igor Sysoev <igor@sysoev.ru> parents: 3024 diff changeset	664
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	665 static ngx_int_t
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	666 ngx_http_file_cache_exists(ngx_http_file_cache_t cache, ngx_http_cache_t c)
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	667 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	668 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	669 ngx_http_file_cache_node_t *fcn;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	670
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	671 ngx_shmtx_lock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	672
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	673 fcn = c->node;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	674
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	675 if (fcn == NULL) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	676 fcn = ngx_http_file_cache_lookup(cache, c->key);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	677 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	678
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	679 if (fcn) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	680 ngx_queue_remove(&fcn->queue);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	681
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	682 if (c->node == NULL) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	683 fcn->uses++;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	684 fcn->count++;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	685 }
3724 e9f0a2497d3c count cache key node usage for cached error statuses Igor Sysoev <igor@sysoev.ru> parents: 3723 diff changeset	686
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	687 if (fcn->error) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	688
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	689 if (fcn->valid_sec < ngx_time()) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	690 goto renew;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	691 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	692
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	693 rc = NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	694
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	695 goto done;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	696 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	697
3966 9c425f22ea36 fuse two if's in one condition Igor Sysoev <igor@sysoev.ru> parents: 3965 diff changeset	698 if (fcn->exists \|\| fcn->uses >= c->min_uses) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	699
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	700 c->exists = fcn->exists;
3969 3ea15c6b16da fix r3968 Igor Sysoev <igor@sysoev.ru> parents: 3968 diff changeset	701 if (fcn->body_start) {
3967 83e41f6f6d96 The cache loader performs two tasks: inserting cache objects in inactivity Igor Sysoev <igor@sysoev.ru> parents: 3966 diff changeset	702 c->body_start = fcn->body_start;
83e41f6f6d96 The cache loader performs two tasks: inserting cache objects in inactivity Igor Sysoev <igor@sysoev.ru> parents: 3966 diff changeset	703 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	704
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	705 rc = NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	706
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	707 goto done;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	708 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	709
3966 9c425f22ea36 fuse two if's in one condition Igor Sysoev <igor@sysoev.ru> parents: 3965 diff changeset	710 rc = NGX_AGAIN;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	711
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	712 goto done;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	713 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	714
5726 25ade23cf281 Core: added ngx_slab_calloc() and ngx_slab_calloc_locked(). Ruslan Ermilov <ru@nginx.com> parents: 5679 diff changeset	715 fcn = ngx_slab_calloc_locked(cache->shpool,
25ade23cf281 Core: added ngx_slab_calloc() and ngx_slab_calloc_locked(). Ruslan Ermilov <ru@nginx.com> parents: 5679 diff changeset	716 sizeof(ngx_http_file_cache_node_t));
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	717 if (fcn == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	718 ngx_shmtx_unlock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	719
2693 197cda0e767e style fix Igor Sysoev <igor@sysoev.ru> parents: 2671 diff changeset	720 (void) ngx_http_file_cache_forced_expire(cache);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	721
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	722 ngx_shmtx_lock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	723
5726 25ade23cf281 Core: added ngx_slab_calloc() and ngx_slab_calloc_locked(). Ruslan Ermilov <ru@nginx.com> parents: 5679 diff changeset	724 fcn = ngx_slab_calloc_locked(cache->shpool,
25ade23cf281 Core: added ngx_slab_calloc() and ngx_slab_calloc_locked(). Ruslan Ermilov <ru@nginx.com> parents: 5679 diff changeset	725 sizeof(ngx_http_file_cache_node_t));
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	726 if (fcn == NULL) {
5822 063f7e75f9ef Upstream: suppressed the file cache slab allocator error messages. Roman Arutyunyan <arut@nginx.com> parents: 5737 diff changeset	727 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
063f7e75f9ef Upstream: suppressed the file cache slab allocator error messages. Roman Arutyunyan <arut@nginx.com> parents: 5737 diff changeset	728 "could not allocate node%s", cache->shpool->log_ctx);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	729 rc = NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	730 goto failed;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	731 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	732 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	733
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	734 ngx_memcpy((u_char *) &fcn->node.key, c->key, sizeof(ngx_rbtree_key_t));
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	735
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	736 ngx_memcpy(fcn->key, &c->key[sizeof(ngx_rbtree_key_t)],
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	737 NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	738
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	739 ngx_rbtree_insert(&cache->sh->rbtree, &fcn->node);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	740
3724 e9f0a2497d3c count cache key node usage for cached error statuses Igor Sysoev <igor@sysoev.ru> parents: 3723 diff changeset	741 fcn->uses = 1;
e9f0a2497d3c count cache key node usage for cached error statuses Igor Sysoev <igor@sysoev.ru> parents: 3723 diff changeset	742 fcn->count = 1;
e9f0a2497d3c count cache key node usage for cached error statuses Igor Sysoev <igor@sysoev.ru> parents: 3723 diff changeset	743
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	744 renew:
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	745
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	746 rc = NGX_DECLINED;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	747
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	748 fcn->valid_msec = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	749 fcn->error = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	750 fcn->exists = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	751 fcn->valid_sec = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	752 fcn->uniq = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	753 fcn->body_start = 0;
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	754 fcn->fs_size = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	755
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	756 done:
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	757
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	758 fcn->expire = ngx_time() + cache->inactive;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	759
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	760 ngx_queue_insert_head(&cache->sh->queue, &fcn->queue);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	761
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	762 c->uniq = fcn->uniq;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	763 c->error = fcn->error;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	764 c->node = fcn;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	765
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	766 failed:
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	767
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	768 ngx_shmtx_unlock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	769
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	770 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	771 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	772
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	773
3696 29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	774 static ngx_int_t
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	775 ngx_http_file_cache_name(ngx_http_request_t r, ngx_path_t path)
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	776 {
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	777 u_char *p;
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	778 ngx_http_cache_t *c;
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	779
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	780 c = r->cache;
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	781
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	782 if (c->file.name.len) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	783 return NGX_OK;
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	784 }
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	785
3696 29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	786 c->file.name.len = path->name.len + 1 + path->len
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	787 + 2 * NGX_HTTP_CACHE_KEY_LEN;
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	788
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	789 c->file.name.data = ngx_pnalloc(r->pool, c->file.name.len + 1);
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	790 if (c->file.name.data == NULL) {
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	791 return NGX_ERROR;
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	792 }
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	793
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	794 ngx_memcpy(c->file.name.data, path->name.data, path->name.len);
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	795
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	796 p = c->file.name.data + path->name.len + 1 + path->len;
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	797 p = ngx_hex_dump(p, c->key, NGX_HTTP_CACHE_KEY_LEN);
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	798 *p = '\0';
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	799
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	800 ngx_create_hashed_filename(path, c->file.name.data, c->file.name.len);
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	801
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	802 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	803 "cache file: \"%s\"", c->file.name.data);
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	804
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	805 return NGX_OK;
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	806 }
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	807
29fcf794c082 ngx_http_file_cache_name() Igor Sysoev <igor@sysoev.ru> parents: 3695 diff changeset	808
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	809 static ngx_http_file_cache_node_t *
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	810 ngx_http_file_cache_lookup(ngx_http_file_cache_t cache, u_char key)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	811 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	812 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	813 ngx_rbtree_key_t node_key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	814 ngx_rbtree_node_t node, sentinel;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	815 ngx_http_file_cache_node_t *fcn;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	816
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	817 ngx_memcpy((u_char *) &node_key, key, sizeof(ngx_rbtree_key_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	818
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	819 node = cache->sh->rbtree.root;
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	820 sentinel = cache->sh->rbtree.sentinel;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	821
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	822 while (node != sentinel) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	823
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	824 if (node_key < node->key) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	825 node = node->left;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	826 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	827 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	828
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	829 if (node_key > node->key) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	830 node = node->right;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	831 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	832 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	833
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	834 /* node_key == node->key */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	835
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4474 diff changeset	836 fcn = (ngx_http_file_cache_node_t *) node;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	837
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4474 diff changeset	838 rc = ngx_memcmp(&key[sizeof(ngx_rbtree_key_t)], fcn->key,
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4474 diff changeset	839 NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t));
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	840
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4474 diff changeset	841 if (rc == 0) {
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4474 diff changeset	842 return fcn;
95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4474 diff changeset	843 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	844
4497 95ab6658654a Fix of rbtree lookup on hash collisions. Maxim Dounin <mdounin@mdounin.ru> parents: 4474 diff changeset	845 node = (rc < 0) ? node->left : node->right;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	846 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	847
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	848 /* not found */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	849
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	850 return NULL;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	851 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	852
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	853
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	854 static void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	855 ngx_http_file_cache_rbtree_insert_value(ngx_rbtree_node_t *temp,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	856 ngx_rbtree_node_t node, ngx_rbtree_node_t sentinel)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	857 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	858 ngx_rbtree_node_t **p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	859 ngx_http_file_cache_node_t cn, cnt;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	860
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	861 for ( ;; ) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	862
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	863 if (node->key < temp->key) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	864
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	865 p = &temp->left;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	866
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	867 } else if (node->key > temp->key) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	868
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	869 p = &temp->right;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	870
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	871 } else { /* node->key == temp->key */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	872
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	873 cn = (ngx_http_file_cache_node_t *) node;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	874 cnt = (ngx_http_file_cache_node_t *) temp;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	875
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	876 p = (ngx_memcmp(cn->key, cnt->key,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	877 NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t))
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	878 < 0)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	879 ? &temp->left : &temp->right;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	880 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	881
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	882 if (*p == sentinel) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	883 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	884 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	885
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	886 temp = *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	887 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	888
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	889 *p = node;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	890 node->parent = temp;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	891 node->left = sentinel;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	892 node->right = sentinel;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	893 ngx_rbt_red(node);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	894 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	895
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	896
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	897 static void
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	898 ngx_http_file_cache_vary(ngx_http_request_t r, u_char vary, size_t len,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	899 u_char *hash)
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	900 {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	901 u_char p, last;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	902 ngx_str_t name;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	903 ngx_md5_t md5;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	904 u_char buf[NGX_HTTP_CACHE_VARY_LEN];
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	905
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	906 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	907 "http file cache vary: \"%*s\"", len, vary);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	908
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	909 ngx_md5_init(&md5);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	910
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	911 ngx_strlow(buf, vary, len);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	912
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	913 p = buf;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	914 last = buf + len;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	915
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	916 while (p < last) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	917
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	918 while (p < last && (p == ' ' \|\| p == ',')) { p++; }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	919
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	920 name.data = p;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	921
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	922 while (p < last && p != ',' && p != ' ') { p++; }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	923
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	924 name.len = p - name.data;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	925
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	926 if (name.len == 0) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	927 break;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	928 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	929
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	930 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	931 "http file cache vary: %V", &name);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	932
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	933 ngx_md5_update(&md5, name.data, name.len);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	934 ngx_md5_update(&md5, (u_char *) ":", sizeof(":") - 1);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	935
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	936 ngx_http_file_cache_vary_header(r, &md5, &name);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	937
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	938 ngx_md5_update(&md5, (u_char *) CRLF, sizeof(CRLF) - 1);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	939 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	940
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	941 ngx_md5_final(hash, &md5);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	942 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	943
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	944
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	945 static void
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	946 ngx_http_file_cache_vary_header(ngx_http_request_t r, ngx_md5_t md5,
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	947 ngx_str_t *name)
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	948 {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	949 ngx_uint_t i;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	950 ngx_list_part_t *part;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	951 ngx_table_elt_t *header;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	952
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	953 part = &r->headers_in.headers.part;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	954 header = part->elts;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	955
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	956 for (i = 0; /* void */ ; i++) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	957
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	958 if (i >= part->nelts) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	959 if (part->next == NULL) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	960 break;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	961 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	962
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	963 part = part->next;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	964 header = part->elts;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	965 i = 0;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	966 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	967
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	968 if (header[i].hash == 0) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	969 continue;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	970 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	971
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	972 if (header[i].key.len != name->len) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	973 continue;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	974 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	975
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	976 if (ngx_strncasecmp(header[i].key.data, name->data, name->len) != 0) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	977 continue;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	978 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	979
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	980 ngx_md5_update(md5, header[i].value.data, header[i].value.len);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	981 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	982 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	983
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	984
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	985 void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	986 ngx_http_file_cache_set_header(ngx_http_request_t r, u_char buf)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	987 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	988 ngx_http_file_cache_header_t h = (ngx_http_file_cache_header_t ) buf;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	989
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	990 u_char *p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	991 ngx_str_t *key;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	992 ngx_uint_t i;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	993 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	994
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	995 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	996 "http file cache set header");
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	997
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	998 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	999
5245 711fa02afae8 Valgrind: supressed complaints about uninitialized bytes. Maxim Dounin <mdounin@mdounin.ru> parents: 5077 diff changeset	1000 ngx_memzero(h, sizeof(ngx_http_file_cache_header_t));
711fa02afae8 Valgrind: supressed complaints about uninitialized bytes. Maxim Dounin <mdounin@mdounin.ru> parents: 5077 diff changeset	1001
5736 2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	1002 h->version = NGX_HTTP_CACHE_VERSION;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1003 h->valid_sec = c->valid_sec;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1004 h->last_modified = c->last_modified;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1005 h->date = c->date;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1006 h->crc32 = c->crc32;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1007 h->valid_msec = (u_short) c->valid_msec;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1008 h->header_start = (u_short) c->header_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1009 h->body_start = (u_short) c->body_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1010
5737 44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1011 if (c->etag.len <= NGX_HTTP_CACHE_ETAG_LEN) {
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1012 h->etag_len = (u_char) c->etag.len;
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1013 ngx_memcpy(h->etag, c->etag.data, c->etag.len);
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1014 }
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1015
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1016 if (c->vary.len) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1017 if (c->vary.len > NGX_HTTP_CACHE_VARY_LEN) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1018 /* should not happen */
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1019 c->vary.len = NGX_HTTP_CACHE_VARY_LEN;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1020 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1021
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1022 h->vary_len = (u_char) c->vary.len;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1023 ngx_memcpy(h->vary, c->vary.data, c->vary.len);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1024
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1025 ngx_http_file_cache_vary(r, c->vary.data, c->vary.len, c->variant);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1026 ngx_memcpy(h->variant, c->variant, NGX_HTTP_CACHE_KEY_LEN);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1027 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1028
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1029 p = buf + sizeof(ngx_http_file_cache_header_t);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1030
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1031 p = ngx_cpymem(p, ngx_http_file_cache_key, sizeof(ngx_http_file_cache_key));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1032
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1033 key = c->keys.elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1034 for (i = 0; i < c->keys.nelts; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1035 p = ngx_copy(p, key[i].data, key[i].len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1036 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1037
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1038 *p = LF;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1039 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1040
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1041
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1042 void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1043 ngx_http_file_cache_update(ngx_http_request_t r, ngx_temp_file_t tf)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1044 {
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1045 off_t fs_size;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1046 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1047 ngx_file_uniq_t uniq;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1048 ngx_file_info_t fi;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1049 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1050 ngx_ext_rename_file_t ext;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1051 ngx_http_file_cache_t *cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1052
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1053 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1054
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1055 if (c->updated) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1056 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1057 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1058
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1059 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1060 "http file cache update");
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1061
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1062 c->updated = 1;
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1063 c->updating = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1064
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1065 cache = c->file_cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1066
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1067 uniq = 0;
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1068 fs_size = 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1069
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1070 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1071 "http file cache rename: \"%s\" to \"%s\"",
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1072 tf->file.name.data, c->file.name.data);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1073
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1074 ext.access = NGX_FILE_OWNER_ACCESS;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1075 ext.path_access = NGX_FILE_OWNER_ACCESS;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1076 ext.time = -1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1077 ext.create_path = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1078 ext.delete_file = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1079 ext.log = r->connection->log;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1080
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1081 rc = ngx_ext_rename_file(&tf->file.name, &c->file.name, &ext);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1082
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1083 if (rc == NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1084
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1085 if (ngx_fd_info(tf->file.fd, &fi) == NGX_FILE_ERROR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1086 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1087 ngx_fd_info_n " \"%s\" failed", tf->file.name.data);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1088
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1089 rc = NGX_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1090
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1091 } else {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1092 uniq = ngx_file_uniq(&fi);
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1093 fs_size = (ngx_file_fs_size(&fi) + cache->bsize - 1) / cache->bsize;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1094 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1095 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1096
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1097 ngx_shmtx_lock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1098
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1099 c->node->count--;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1100 c->node->uniq = uniq;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1101 c->node->body_start = c->body_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1102
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1103 cache->sh->size += fs_size - c->node->fs_size;
e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1104 c->node->fs_size = fs_size;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1105
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1106 if (rc == NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1107 c->node->exists = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1108 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1109
2927 55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	1110 c->node->updating = 0;
55ceaef03d34 proxy_cache_use_stale/fastcgi_cache_use_stale updating Igor Sysoev <igor@sysoev.ru> parents: 2926 diff changeset	1111
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1112 ngx_shmtx_unlock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1113 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1114
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1115
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1116 void
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1117 ngx_http_file_cache_update_header(ngx_http_request_t *r)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1118 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1119 ssize_t n;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1120 ngx_err_t err;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1121 ngx_file_t file;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1122 ngx_file_info_t fi;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1123 ngx_http_cache_t *c;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1124 ngx_http_file_cache_header_t h;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1125
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1126 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1127 "http file cache update header");
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1128
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1129 c = r->cache;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1130
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1131 ngx_memzero(&file, sizeof(ngx_file_t));
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1132
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1133 file.name = c->file.name;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1134 file.log = r->connection->log;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1135 file.fd = ngx_open_file(file.name.data, NGX_FILE_RDWR, NGX_FILE_OPEN, 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1136
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1137 if (file.fd == NGX_INVALID_FILE) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1138 err = ngx_errno;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1139
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1140 /* cache file may have been deleted */
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1141
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1142 if (err == NGX_ENOENT) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1143 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1144 "http file cache \"%s\" not found",
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1145 file.name.data);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1146 return;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1147 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1148
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1149 ngx_log_error(NGX_LOG_CRIT, r->connection->log, err,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1150 ngx_open_file_n " \"%s\" failed", file.name.data);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1151 return;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1152 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1153
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1154 /*
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1155 * make sure cache file wasn't replaced;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1156 * if it was, do nothing
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1157 */
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1158
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1159 if (ngx_fd_info(file.fd, &fi) == NGX_FILE_ERROR) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1160 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1161 ngx_fd_info_n " \"%s\" failed", file.name.data);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1162 goto done;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1163 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1164
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1165 if (c->uniq != ngx_file_uniq(&fi)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1166 \|\| c->length != ngx_file_size(&fi))
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1167 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1168 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1169 "http file cache \"%s\" changed",
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1170 file.name.data);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1171 goto done;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1172 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1173
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1174 n = ngx_read_file(&file, (u_char *) &h,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1175 sizeof(ngx_http_file_cache_header_t), 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1176
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1177 if (n == NGX_ERROR) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1178 goto done;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1179 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1180
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1181 if ((size_t) n != sizeof(ngx_http_file_cache_header_t)) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1182 ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1183 ngx_read_file_n " read only %z of %z from \"%s\"",
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1184 n, sizeof(ngx_http_file_cache_header_t), file.name.data);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1185 goto done;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1186 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1187
5736 2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	1188 if (h.version != NGX_HTTP_CACHE_VERSION
2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	1189 \|\| h.last_modified != c->last_modified
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1190 \|\| h.crc32 != c->crc32
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1191 \|\| h.header_start != c->header_start
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1192 \|\| h.body_start != c->body_start)
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1193 {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1194 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1195 "http file cache \"%s\" content changed",
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1196 file.name.data);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1197 goto done;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1198 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1199
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1200 /*
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1201 * update cache file header with new data,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1202 * notably h.valid_sec and h.date
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1203 */
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1204
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1205 ngx_memzero(&h, sizeof(ngx_http_file_cache_header_t));
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1206
5736 2fe1967f8854 Cache: version in cache files. Maxim Dounin <mdounin@mdounin.ru> parents: 5726 diff changeset	1207 h.version = NGX_HTTP_CACHE_VERSION;
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1208 h.valid_sec = c->valid_sec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1209 h.last_modified = c->last_modified;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1210 h.date = c->date;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1211 h.crc32 = c->crc32;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1212 h.valid_msec = (u_short) c->valid_msec;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1213 h.header_start = (u_short) c->header_start;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1214 h.body_start = (u_short) c->body_start;
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1215
5737 44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1216 if (c->etag.len <= NGX_HTTP_CACHE_ETAG_LEN) {
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1217 h.etag_len = (u_char) c->etag.len;
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1218 ngx_memcpy(h.etag, c->etag.data, c->etag.len);
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1219 }
44b9ab7752e3 Cache: ETag now saved into cache header. Maxim Dounin <mdounin@mdounin.ru> parents: 5736 diff changeset	1220
5878 2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1221 if (c->vary.len) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1222 if (c->vary.len > NGX_HTTP_CACHE_VARY_LEN) {
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1223 /* should not happen */
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1224 c->vary.len = NGX_HTTP_CACHE_VARY_LEN;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1225 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1226
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1227 h.vary_len = (u_char) c->vary.len;
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1228 ngx_memcpy(h.vary, c->vary.data, c->vary.len);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1229
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1230 ngx_http_file_cache_vary(r, c->vary.data, c->vary.len, c->variant);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1231 ngx_memcpy(h.variant, c->variant, NGX_HTTP_CACHE_KEY_LEN);
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1232 }
2c89956b6a76 Cache: hash of Vary headers now stored in cache. Maxim Dounin <mdounin@mdounin.ru> parents: 5822 diff changeset	1233
5441 43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1234 (void) ngx_write_file(&file, (u_char *) &h,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1235 sizeof(ngx_http_file_cache_header_t), 0);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1236
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1237 done:
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1238
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1239 if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1240 ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno,
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1241 ngx_close_file_n " \"%s\" failed", file.name.data);
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1242 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1243 }
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1244
43ccaf8e8728 Upstream: cache revalidation with conditional requests. Maxim Dounin <mdounin@mdounin.ru> parents: 5359 diff changeset	1245
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1246 ngx_int_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1247 ngx_http_cache_send(ngx_http_request_t *r)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1248 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1249 ngx_int_t rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1250 ngx_buf_t *b;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1251 ngx_chain_t out;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1252 ngx_http_cache_t *c;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1253
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1254 c = r->cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1255
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1256 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3965 90b0487fba44 style fix Igor Sysoev <igor@sysoev.ru> parents: 3942 diff changeset	1257 "http file cache send: %s", c->file.name.data);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1258
4150 b9ee14871bf1 Cache: fix for sending of empty responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4034 diff changeset	1259 if (r != r->main && c->length - c->body_start == 0) {
b9ee14871bf1 Cache: fix for sending of empty responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4034 diff changeset	1260 return ngx_http_send_header(r);
b9ee14871bf1 Cache: fix for sending of empty responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4034 diff changeset	1261 }
b9ee14871bf1 Cache: fix for sending of empty responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4034 diff changeset	1262
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1263 /* we need to allocate all before the header would be sent */
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1264
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1265 b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1266 if (b == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1267 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1268 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1269
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1270 b->file = ngx_pcalloc(r->pool, sizeof(ngx_file_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1271 if (b->file == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1272 return NGX_HTTP_INTERNAL_SERVER_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1273 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1274
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1275 rc = ngx_http_send_header(r);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1276
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1277 if (rc == NGX_ERROR \|\| rc > NGX_OK \|\| r->header_only) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1278 return rc;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1279 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1280
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1281 b->file_pos = c->body_start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1282 b->file_last = c->length;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1283
4150 b9ee14871bf1 Cache: fix for sending of empty responses. Maxim Dounin <mdounin@mdounin.ru> parents: 4034 diff changeset	1284 b->in_file = (c->length - c->body_start) ? 1: 0;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1285 b->last_buf = (r == r->main) ? 1: 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1286 b->last_in_chain = 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1287
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1288 b->file->fd = c->file.fd;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1289 b->file->name = c->file.name;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1290 b->file->log = r->connection->log;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1291
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1292 out.buf = b;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1293 out.next = NULL;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1294
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1295 return ngx_http_output_filter(r, &out);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1296 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1297
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1298
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1299 void
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1300 ngx_http_file_cache_free(ngx_http_cache_t c, ngx_temp_file_t tf)
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1301 {
3694 dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1302 ngx_http_file_cache_t *cache;
dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1303 ngx_http_file_cache_node_t *fcn;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1304
3917 2a70484a6580 fix a broken cached response if bypass/no_cache directive values are different, Igor Sysoev <igor@sysoev.ru> parents: 3899 diff changeset	1305 if (c->updated \|\| c->node == NULL) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1306 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1307 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1308
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1309 cache = c->file_cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1310
3713 f0b62d1ac7af move debug logging inside ngx_http_file_cache_free() Igor Sysoev <igor@sysoev.ru> parents: 3711 diff changeset	1311 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->file.log, 0,
f0b62d1ac7af move debug logging inside ngx_http_file_cache_free() Igor Sysoev <igor@sysoev.ru> parents: 3711 diff changeset	1312 "http file cache free, fd: %d", c->file.fd);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1313
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1314 ngx_shmtx_lock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1315
3694 dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1316 fcn = c->node;
dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1317 fcn->count--;
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1318
ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1319 if (c->updating) {
ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1320 fcn->updating = 0;
ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1321 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1322
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1323 if (c->error) {
3694 dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1324 fcn->error = c->error;
dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1325
3743 c469ffeab569 error status codes could be cached for next request only, Igor Sysoev <igor@sysoev.ru> parents: 3732 diff changeset	1326 if (c->valid_sec) {
c469ffeab569 error status codes could be cached for next request only, Igor Sysoev <igor@sysoev.ru> parents: 3732 diff changeset	1327 fcn->valid_sec = c->valid_sec;
c469ffeab569 error status codes could be cached for next request only, Igor Sysoev <igor@sysoev.ru> parents: 3732 diff changeset	1328 fcn->valid_msec = c->valid_msec;
c469ffeab569 error status codes could be cached for next request only, Igor Sysoev <igor@sysoev.ru> parents: 3732 diff changeset	1329 }
c469ffeab569 error status codes could be cached for next request only, Igor Sysoev <igor@sysoev.ru> parents: 3732 diff changeset	1330
3723 14ad3210fc73 do not free unused cache node if cache min_uses > 1, Igor Sysoev <igor@sysoev.ru> parents: 3713 diff changeset	1331 } else if (!fcn->exists && fcn->count == 0 && c->min_uses == 1) {
3694 dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1332 ngx_queue_remove(&fcn->queue);
dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1333 ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);
dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1334 ngx_slab_free_locked(cache->shpool, fcn);
dfb17155eca9 delete empty cache zone node if we could not get response to cache Igor Sysoev <igor@sysoev.ru> parents: 3526 diff changeset	1335 c->node = NULL;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1336 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1337
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1338 ngx_shmtx_unlock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1339
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1340 c->updated = 1;
ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1341 c->updating = 0;
ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1342
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1343 if (c->temp_file) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1344 if (tf && tf->file.fd != NGX_INVALID_FILE) {
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1345 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->file.log, 0,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1346 "http file cache incomplete: \"%s\"",
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1347 tf->file.name.data);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1348
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1349 if (ngx_delete_file(tf->file.name.data) == NGX_FILE_ERROR) {
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1350 ngx_log_error(NGX_LOG_CRIT, c->file.log, ngx_errno,
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1351 ngx_delete_file_n " \"%s\" failed",
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1352 tf->file.name.data);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1353 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1354 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1355 }
4385 70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	1356
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	1357 if (c->wait_event.timer_set) {
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	1358 ngx_del_timer(&c->wait_event);
70ba81827472 Cache locks initial implementation. Maxim Dounin <mdounin@mdounin.ru> parents: 4340 diff changeset	1359 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1360 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1361
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1362
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1363 static void
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1364 ngx_http_file_cache_cleanup(void *data)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1365 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1366 ngx_http_cache_t *c = data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1367
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1368 if (c->updated) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1369 return;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1370 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1371
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1372 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->file.log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1373 "http file cache cleanup");
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1374
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1375 if (c->updating) {
ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1376 ngx_log_error(NGX_LOG_ALERT, c->file.log, 0,
ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1377 "stalled cache updating, error:%ui", c->error);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1378 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1379
3711 ce6ba077c270 several changes in cache cleanup handling: Igor Sysoev <igor@sysoev.ru> parents: 3710 diff changeset	1380 ngx_http_file_cache_free(c, NULL);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1381 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1382
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1383
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1384 static time_t
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1385 ngx_http_file_cache_forced_expire(ngx_http_file_cache_t *cache)
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1386 {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1387 u_char *name;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1388 size_t len;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1389 time_t wait;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1390 ngx_uint_t tries;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1391 ngx_path_t *path;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1392 ngx_queue_t *q;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1393 ngx_http_file_cache_node_t *fcn;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1394
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1395 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1396 "http file cache forced expire");
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1397
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1398 path = cache->path;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1399 len = path->name.len + 1 + path->len + 2 * NGX_HTTP_CACHE_KEY_LEN;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1400
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1401 name = ngx_alloc(len + 1, ngx_cycle->log);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1402 if (name == NULL) {
2694 49a1382b249b set cache manager maximum sleep time to 10s Igor Sysoev <igor@sysoev.ru> parents: 2693 diff changeset	1403 return 10;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1404 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1405
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1406 ngx_memcpy(name, path->name.data, path->name.len);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1407
2694 49a1382b249b set cache manager maximum sleep time to 10s Igor Sysoev <igor@sysoev.ru> parents: 2693 diff changeset	1408 wait = 10;
3728 a29bb11f8c80 change logic slightly Igor Sysoev <igor@sysoev.ru> parents: 3727 diff changeset	1409 tries = 20;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1410
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1411 ngx_shmtx_lock(&cache->shpool->mutex);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1412
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	1413 for (q = ngx_queue_last(&cache->sh->queue);
b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	1414 q != ngx_queue_sentinel(&cache->sh->queue);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1415 q = ngx_queue_prev(q))
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1416 {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1417 fcn = ngx_queue_data(q, ngx_http_file_cache_node_t, queue);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1418
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1419 ngx_log_debug6(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1420 "http file cache forced expire: #%d %d %02xd%02xd%02xd%02xd",
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1421 fcn->count, fcn->exists,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1422 fcn->key[0], fcn->key[1], fcn->key[2], fcn->key[3]);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1423
3727 fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1424 if (fcn->count == 0) {
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1425 ngx_http_file_cache_delete(cache, q, name);
3885 46938b7418c6 fix CPU hog in cache manager Igor Sysoev <igor@sysoev.ru> parents: 3755 diff changeset	1426 wait = 0;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1427
3727 fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1428 } else {
3728 a29bb11f8c80 change logic slightly Igor Sysoev <igor@sysoev.ru> parents: 3727 diff changeset	1429 if (--tries) {
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1430 continue;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1431 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1432
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1433 wait = 1;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1434 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1435
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1436 break;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1437 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1438
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1439 ngx_shmtx_unlock(&cache->shpool->mutex);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1440
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1441 ngx_free(name);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1442
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1443 return wait;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1444 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1445
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1446
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1447 static time_t
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1448 ngx_http_file_cache_expire(ngx_http_file_cache_t *cache)
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1449 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1450 u_char name, p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1451 size_t len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1452 time_t now, wait;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1453 ngx_path_t *path;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1454 ngx_queue_t *q;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1455 ngx_http_file_cache_node_t *fcn;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1456 u_char key[2 * NGX_HTTP_CACHE_KEY_LEN];
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1457
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1458 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1459 "http file cache expire");
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1460
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1461 path = cache->path;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1462 len = path->name.len + 1 + path->len + 2 * NGX_HTTP_CACHE_KEY_LEN;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1463
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1464 name = ngx_alloc(len + 1, ngx_cycle->log);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1465 if (name == NULL) {
2694 49a1382b249b set cache manager maximum sleep time to 10s Igor Sysoev <igor@sysoev.ru> parents: 2693 diff changeset	1466 return 10;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1467 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1468
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1469 ngx_memcpy(name, path->name.data, path->name.len);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1470
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1471 now = ngx_time();
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1472
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1473 ngx_shmtx_lock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1474
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1475 for ( ;; ) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1476
5679 5748ce74c1cc Cache: added ngx_quit check to ngx_http_file_cache_expire(). Maxim Dounin <mdounin@mdounin.ru> parents: 5441 diff changeset	1477 if (ngx_quit \|\| ngx_terminate) {
5748ce74c1cc Cache: added ngx_quit check to ngx_http_file_cache_expire(). Maxim Dounin <mdounin@mdounin.ru> parents: 5441 diff changeset	1478 wait = 1;
5748ce74c1cc Cache: added ngx_quit check to ngx_http_file_cache_expire(). Maxim Dounin <mdounin@mdounin.ru> parents: 5441 diff changeset	1479 break;
5748ce74c1cc Cache: added ngx_quit check to ngx_http_file_cache_expire(). Maxim Dounin <mdounin@mdounin.ru> parents: 5441 diff changeset	1480 }
5748ce74c1cc Cache: added ngx_quit check to ngx_http_file_cache_expire(). Maxim Dounin <mdounin@mdounin.ru> parents: 5441 diff changeset	1481
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	1482 if (ngx_queue_empty(&cache->sh->queue)) {
2694 49a1382b249b set cache manager maximum sleep time to 10s Igor Sysoev <igor@sysoev.ru> parents: 2693 diff changeset	1483 wait = 10;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1484 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1485 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1486
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	1487 q = ngx_queue_last(&cache->sh->queue);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1488
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1489 fcn = ngx_queue_data(q, ngx_http_file_cache_node_t, queue);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1490
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1491 wait = fcn->expire - now;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1492
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1493 if (wait > 0) {
2694 49a1382b249b set cache manager maximum sleep time to 10s Igor Sysoev <igor@sysoev.ru> parents: 2693 diff changeset	1494 wait = wait > 10 ? 10 : wait;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1495 break;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1496 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1497
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1498 ngx_log_debug6(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1499 "http file cache expire: #%d %d %02xd%02xd%02xd%02xd",
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1500 fcn->count, fcn->exists,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1501 fcn->key[0], fcn->key[1], fcn->key[2], fcn->key[3]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1502
3727 fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1503 if (fcn->count == 0) {
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1504 ngx_http_file_cache_delete(cache, q, name);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1505 continue;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1506 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1507
3755 76e3a93821b1 fix race condition if during reconfiguration two cache managers try Igor Sysoev <igor@sysoev.ru> parents: 3744 diff changeset	1508 if (fcn->deleting) {
3942 2e8dbd773d63 fix r3756: release lock to allow other process to delete cache node Igor Sysoev <igor@sysoev.ru> parents: 3917 diff changeset	1509 wait = 1;
2e8dbd773d63 fix r3756: release lock to allow other process to delete cache node Igor Sysoev <igor@sysoev.ru> parents: 3917 diff changeset	1510 break;
3755 76e3a93821b1 fix race condition if during reconfiguration two cache managers try Igor Sysoev <igor@sysoev.ru> parents: 3744 diff changeset	1511 }
76e3a93821b1 fix race condition if during reconfiguration two cache managers try Igor Sysoev <igor@sysoev.ru> parents: 3744 diff changeset	1512
3727 fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1513 p = ngx_hex_dump(key, (u_char *) &fcn->node.key,
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1514 sizeof(ngx_rbtree_key_t));
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1515 len = NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t);
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1516 (void) ngx_hex_dump(p, fcn->key, len);
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1517
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1518 /*
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1519 * abnormally exited workers may leave locked cache entries,
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1520 * and although it may be safe to remove them completely,
4340 4533d7684e14 Cache: only complain on long locked entries. Maxim Dounin <mdounin@mdounin.ru> parents: 4339 diff changeset	1521 * we prefer to just move them to the top of the inactive queue
3727 fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1522 */
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1523
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1524 ngx_queue_remove(q);
4340 4533d7684e14 Cache: only complain on long locked entries. Maxim Dounin <mdounin@mdounin.ru> parents: 4339 diff changeset	1525 fcn->expire = ngx_time() + cache->inactive;
4533d7684e14 Cache: only complain on long locked entries. Maxim Dounin <mdounin@mdounin.ru> parents: 4339 diff changeset	1526 ngx_queue_insert_head(&cache->sh->queue, &fcn->queue);
3727 fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1527
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1528 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1529 "ignore long locked inactive cache entry %*s, count:%d",
fd2bb219de22 change order Igor Sysoev <igor@sysoev.ru> parents: 3726 diff changeset	1530 2 * NGX_HTTP_CACHE_KEY_LEN, key, fcn->count);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1531 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1532
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1533 ngx_shmtx_unlock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1534
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1535 ngx_free(name);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1536
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1537 return wait;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1538 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1539
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1540
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1541 static void
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1542 ngx_http_file_cache_delete(ngx_http_file_cache_t cache, ngx_queue_t q,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1543 u_char *name)
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1544 {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1545 u_char *p;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1546 size_t len;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1547 ngx_path_t *path;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1548 ngx_http_file_cache_node_t *fcn;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1549
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1550 fcn = ngx_queue_data(q, ngx_http_file_cache_node_t, queue);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1551
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1552 if (fcn->exists) {
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1553 cache->sh->size -= fcn->fs_size;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1554
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1555 path = cache->path;
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1556 p = name + path->name.len + 1 + path->len;
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1557 p = ngx_hex_dump(p, (u_char *) &fcn->node.key,
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1558 sizeof(ngx_rbtree_key_t));
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1559 len = NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t);
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1560 p = ngx_hex_dump(p, fcn->key, len);
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1561 *p = '\0';
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1562
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1563 fcn->count++;
3755 76e3a93821b1 fix race condition if during reconfiguration two cache managers try Igor Sysoev <igor@sysoev.ru> parents: 3744 diff changeset	1564 fcn->deleting = 1;
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1565 ngx_shmtx_unlock(&cache->shpool->mutex);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1566
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1567 len = path->name.len + 1 + path->len + 2 * NGX_HTTP_CACHE_KEY_LEN;
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1568 ngx_create_hashed_filename(path, name, len);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1569
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1570 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1571 "http file cache expire: \"%s\"", name);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1572
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1573 if (ngx_delete_file(name) == NGX_FILE_ERROR) {
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1574 ngx_log_error(NGX_LOG_CRIT, ngx_cycle->log, ngx_errno,
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1575 ngx_delete_file_n " \"%s\" failed", name);
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1576 }
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1577
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1578 ngx_shmtx_lock(&cache->shpool->mutex);
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1579 fcn->count--;
3755 76e3a93821b1 fix race condition if during reconfiguration two cache managers try Igor Sysoev <igor@sysoev.ru> parents: 3744 diff changeset	1580 fcn->deleting = 0;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1581 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1582
3726 282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1583 if (fcn->count == 0) {
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1584 ngx_queue_remove(q);
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1585 ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node);
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1586 ngx_slab_free_locked(cache->shpool, fcn);
282ddd49f925 ) delete cache key node after a cache file removal Igor Sysoev <igor@sysoev.ru>* parents: 3724 diff changeset	1587 }
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1588 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1589
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1590
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1591 static time_t
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1592 ngx_http_file_cache_manager(void *data)
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1593 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1594 ngx_http_file_cache_t *cache = data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1595
3018 8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1596 off_t size;
3885 46938b7418c6 fix CPU hog in cache manager Igor Sysoev <igor@sysoev.ru> parents: 3755 diff changeset	1597 time_t next, wait;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1598
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1599 next = ngx_http_file_cache_expire(cache);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1600
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1601 cache->last = ngx_current_msec;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1602 cache->files = 0;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1603
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1604 for ( ;; ) {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1605 ngx_shmtx_lock(&cache->shpool->mutex);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1606
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	1607 size = cache->sh->size;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1608
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1609 ngx_shmtx_unlock(&cache->shpool->mutex);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1610
2631 73571521c2eb add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2626 diff changeset	1611 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
73571521c2eb add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2626 diff changeset	1612 "http file cache size: %O", size);
73571521c2eb add debug logging Igor Sysoev <igor@sysoev.ru> parents: 2626 diff changeset	1613
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1614 if (size < cache->max_size) {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1615 return next;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1616 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1617
3885 46938b7418c6 fix CPU hog in cache manager Igor Sysoev <igor@sysoev.ru> parents: 3755 diff changeset	1618 wait = ngx_http_file_cache_forced_expire(cache);
46938b7418c6 fix CPU hog in cache manager Igor Sysoev <igor@sysoev.ru> parents: 3755 diff changeset	1619
46938b7418c6 fix CPU hog in cache manager Igor Sysoev <igor@sysoev.ru> parents: 3755 diff changeset	1620 if (wait > 0) {
46938b7418c6 fix CPU hog in cache manager Igor Sysoev <igor@sysoev.ru> parents: 3755 diff changeset	1621 return wait;
46938b7418c6 fix CPU hog in cache manager Igor Sysoev <igor@sysoev.ru> parents: 3755 diff changeset	1622 }
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1623
3972 c1a69e03bdf2 rename ngx_http_file_cache_manager_sleep() to ngx_http_file_cache_loader_sleep() Igor Sysoev <igor@sysoev.ru> parents: 3971 diff changeset	1624 if (ngx_quit \|\| ngx_terminate) {
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1625 return next;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1626 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1627 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1628 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1629
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1630
3018 8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1631 static void
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1632 ngx_http_file_cache_loader(void *data)
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1633 {
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1634 ngx_http_file_cache_t *cache = data;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1635
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1636 ngx_tree_ctx_t tree;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1637
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1638 if (!cache->sh->cold \|\| cache->sh->loading) {
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1639 return;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1640 }
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1641
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1642 if (!ngx_atomic_cmp_set(&cache->sh->loading, 0, ngx_pid)) {
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1643 return;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1644 }
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1645
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1646 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1647 "http file cache loader");
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1648
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1649 tree.init_handler = NULL;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1650 tree.file_handler = ngx_http_file_cache_manage_file;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1651 tree.pre_tree_handler = ngx_http_file_cache_noop;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1652 tree.post_tree_handler = ngx_http_file_cache_noop;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1653 tree.spec_handler = ngx_http_file_cache_delete_file;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1654 tree.data = cache;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1655 tree.alloc = 0;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1656 tree.log = ngx_cycle->log;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1657
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1658 cache->last = ngx_current_msec;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1659 cache->files = 0;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1660
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1661 if (ngx_walk_tree(&tree, &cache->path->name) == NGX_ABORT) {
3020 364ea8f54a2f unlock incompletely loaded cache Igor Sysoev <igor@sysoev.ru> parents: 3018 diff changeset	1662 cache->sh->loading = 0;
3018 8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1663 return;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1664 }
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1665
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1666 cache->sh->cold = 0;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1667 cache->sh->loading = 0;
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1668
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1669 ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1670 "http file cache: %V %.3fM, bsize: %uz",
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1671 &cache->path->name,
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1672 ((double) cache->sh->size * cache->bsize) / (1024 * 1024),
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1673 cache->bsize);
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1674 }
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1675
8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	1676
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1677 static ngx_int_t
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1678 ngx_http_file_cache_noop(ngx_tree_ctx_t ctx, ngx_str_t path)
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1679 {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1680 return NGX_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1681 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1682
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1683
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1684 static ngx_int_t
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1685 ngx_http_file_cache_manage_file(ngx_tree_ctx_t ctx, ngx_str_t path)
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1686 {
4018 5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1687 ngx_msec_t elapsed;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1688 ngx_http_file_cache_t *cache;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1689
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1690 cache = ctx->data;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1691
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1692 if (ngx_http_file_cache_add_file(ctx, path) != NGX_OK) {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1693 (void) ngx_http_file_cache_delete_file(ctx, path);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1694 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1695
4018 5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1696 if (++cache->files >= cache->loader_files) {
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1697 ngx_http_file_cache_loader_sleep(cache);
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1698
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1699 } else {
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1700 ngx_time_update();
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1701
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1702 elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1703
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1704 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1705 "http file cache loader time elapsed: %M", elapsed);
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1706
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1707 if (elapsed >= cache->loader_threshold) {
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1708 ngx_http_file_cache_loader_sleep(cache);
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1709 }
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1710 }
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1711
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1712 return (ngx_quit \|\| ngx_terminate) ? NGX_ABORT : NGX_OK;
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1713 }
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1714
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1715
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1716 static void
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1717 ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache)
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1718 {
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1719 ngx_msleep(cache->loader_sleep);
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1720
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1721 ngx_time_update();
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1722
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1723 cache->last = ngx_current_msec;
5e544655d97b The change in adaptive loader behaviour introduced in r3975: Igor Sysoev <igor@sysoev.ru> parents: 3974 diff changeset	1724 cache->files = 0;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1725 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1726
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1727
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1728 static ngx_int_t
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1729 ngx_http_file_cache_add_file(ngx_tree_ctx_t ctx, ngx_str_t name)
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1730 {
3970 2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1731 u_char *p;
2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1732 ngx_int_t n;
2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1733 ngx_uint_t i;
2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1734 ngx_http_cache_t c;
2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1735 ngx_http_file_cache_t *cache;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1736
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1737 if (name->len < 2 * NGX_HTTP_CACHE_KEY_LEN) {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1738 return NGX_ERROR;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1739 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1740
3970 2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1741 if (ctx->size < (off_t) sizeof(ngx_http_file_cache_header_t)) {
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1742 ngx_log_error(NGX_LOG_CRIT, ctx->log, 0,
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1743 "cache file \"%s\" is too small", name->data);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1744 return NGX_ERROR;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1745 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1746
3970 2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1747 ngx_memzero(&c, sizeof(ngx_http_cache_t));
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1748 cache = ctx->data;
e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1749
3970 2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1750 c.length = ctx->size;
2d05952a324d elimination of reading cache files by cache loader Igor Sysoev <igor@sysoev.ru> parents: 3969 diff changeset	1751 c.fs_size = (ctx->fs_size + cache->bsize - 1) / cache->bsize;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1752
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1753 p = &name->data[name->len - 2 * NGX_HTTP_CACHE_KEY_LEN];
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1754
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1755 for (i = 0; i < NGX_HTTP_CACHE_KEY_LEN; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1756 n = ngx_hextoi(p, 2);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1757
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1758 if (n == NGX_ERROR) {
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1759 return NGX_ERROR;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1760 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1761
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1762 p += 2;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1763
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1764 c.key[i] = (u_char) n;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1765 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1766
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1767 return ngx_http_file_cache_add(cache, &c);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1768 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1769
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1770
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1771 static ngx_int_t
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1772 ngx_http_file_cache_add(ngx_http_file_cache_t cache, ngx_http_cache_t c)
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1773 {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1774 ngx_http_file_cache_node_t *fcn;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1775
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1776 ngx_shmtx_lock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1777
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1778 fcn = ngx_http_file_cache_lookup(cache, c->key);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1779
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1780 if (fcn == NULL) {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1781
5726 25ade23cf281 Core: added ngx_slab_calloc() and ngx_slab_calloc_locked(). Ruslan Ermilov <ru@nginx.com> parents: 5679 diff changeset	1782 fcn = ngx_slab_calloc_locked(cache->shpool,
25ade23cf281 Core: added ngx_slab_calloc() and ngx_slab_calloc_locked(). Ruslan Ermilov <ru@nginx.com> parents: 5679 diff changeset	1783 sizeof(ngx_http_file_cache_node_t));
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1784 if (fcn == NULL) {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1785 ngx_shmtx_unlock(&cache->shpool->mutex);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1786 return NGX_ERROR;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1787 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1788
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1789 ngx_memcpy((u_char *) &fcn->node.key, c->key, sizeof(ngx_rbtree_key_t));
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1790
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1791 ngx_memcpy(fcn->key, &c->key[sizeof(ngx_rbtree_key_t)],
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1792 NGX_HTTP_CACHE_KEY_LEN - sizeof(ngx_rbtree_key_t));
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1793
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	1794 ngx_rbtree_insert(&cache->sh->rbtree, &fcn->node);
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1795
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1796 fcn->uses = 1;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1797 fcn->exists = 1;
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1798 fcn->fs_size = c->fs_size;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1799
3899 e7cd13b7f759 Use more precise stat.st_blocks to account cache size on Unix Igor Sysoev <igor@sysoev.ru> parents: 3885 diff changeset	1800 cache->sh->size += c->fs_size;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1801
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1802 } else {
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1803 ngx_queue_remove(&fcn->queue);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1804 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1805
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1806 fcn->expire = ngx_time() + cache->inactive;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1807
2720 b3b8c66bd520 support attaching to an existent Win32 shared memory Igor Sysoev <igor@sysoev.ru> parents: 2716 diff changeset	1808 ngx_queue_insert_head(&cache->sh->queue, &fcn->queue);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1809
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1810 ngx_shmtx_unlock(&cache->shpool->mutex);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1811
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1812 return NGX_OK;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1813 }
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1814
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1815
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1816 static ngx_int_t
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1817 ngx_http_file_cache_delete_file(ngx_tree_ctx_t ctx, ngx_str_t path)
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1818 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1819 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1820 "http file cache delete: \"%s\"", path->data);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1821
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1822 if (ngx_delete_file(path->data) == NGX_FILE_ERROR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1823 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1824 ngx_delete_file_n " \"%s\" failed", path->data);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1825 }
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	1826
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1827 return NGX_OK;
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1828 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1829
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1830
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1831 time_t
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1832 ngx_http_file_cache_valid(ngx_array_t *cache_valid, ngx_uint_t status)
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1833 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1834 ngx_uint_t i;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1835 ngx_http_cache_valid_t *valid;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1836
2626 b0cfe5f66e8d fix segfault introduced in r2602 if there is 502/504 error Igor Sysoev <igor@sysoev.ru> parents: 2616 diff changeset	1837 if (cache_valid == NULL) {
b0cfe5f66e8d fix segfault introduced in r2602 if there is 502/504 error Igor Sysoev <igor@sysoev.ru> parents: 2616 diff changeset	1838 return 0;
b0cfe5f66e8d fix segfault introduced in r2602 if there is 502/504 error Igor Sysoev <igor@sysoev.ru> parents: 2616 diff changeset	1839 }
b0cfe5f66e8d fix segfault introduced in r2602 if there is 502/504 error Igor Sysoev <igor@sysoev.ru> parents: 2616 diff changeset	1840
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1841 valid = cache_valid->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1842 for (i = 0; i < cache_valid->nelts; i++) {
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1843
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1844 if (valid[i].status == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1845 return valid[i].valid;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1846 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1847
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1848 if (valid[i].status == status) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1849 return valid[i].valid;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1850 }
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1851 }
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1852
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1853 return 0;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1854 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1855
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1856
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1857 char *
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1858 ngx_http_file_cache_set_slot(ngx_conf_t cf, ngx_command_t cmd, void *conf)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1859 {
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1860 off_t max_size;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1861 u_char last, p;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1862 time_t inactive;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1863 ssize_t size;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1864 ngx_str_t s, name, *value;
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	1865 ngx_int_t loader_files;
41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	1866 ngx_msec_t loader_sleep, loader_threshold;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1867 ngx_uint_t i, n;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1868 ngx_http_file_cache_t *cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1869
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1870 cache = ngx_pcalloc(cf->pool, sizeof(ngx_http_file_cache_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1871 if (cache == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1872 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1873 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1874
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1875 cache->path = ngx_pcalloc(cf->pool, sizeof(ngx_path_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1876 if (cache->path == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1877 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1878 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1879
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1880 inactive = 600;
3974 d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1881 loader_files = 100;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1882 loader_sleep = 50;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1883 loader_threshold = 200;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1884
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1885 name.len = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1886 size = 0;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1887 max_size = NGX_MAX_OFF_T_VALUE;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1888
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1889 value = cf->args->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1890
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1891 cache->path->name = value[1];
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1892
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1893 if (cache->path->name.data[cache->path->name.len - 1] == '/') {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1894 cache->path->name.len--;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1895 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1896
5330 314c3d7cc3a5 Backed out f1a91825730a and 7094bd12c1ff. Maxim Dounin <mdounin@mdounin.ru> parents: 5317 diff changeset	1897 if (ngx_conf_full_name(cf->cycle, &cache->path->name, 0) != NGX_OK) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1898 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1899 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1900
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1901 for (i = 2; i < cf->args->nelts; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1902
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1903 if (ngx_strncmp(value[i].data, "levels=", 7) == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1904
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1905 p = value[i].data + 7;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1906 last = value[i].data + value[i].len;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1907
2671 627dee566f6c fix cache path slot Igor Sysoev <igor@sysoev.ru> parents: 2632 diff changeset	1908 for (n = 0; n < 3 && p < last; n++) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1909
2671 627dee566f6c fix cache path slot Igor Sysoev <igor@sysoev.ru> parents: 2632 diff changeset	1910 if (p > '0' && p < '3') {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1911
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1912 cache->path->level[n] = *p++ - '0';
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1913 cache->path->len += cache->path->level[n] + 1;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1914
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1915 if (p == last) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1916 break;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1917 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1918
2671 627dee566f6c fix cache path slot Igor Sysoev <igor@sysoev.ru> parents: 2632 diff changeset	1919 if (*p++ == ':' && n < 2 && p != last) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1920 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1921 }
2671 627dee566f6c fix cache path slot Igor Sysoev <igor@sysoev.ru> parents: 2632 diff changeset	1922
627dee566f6c fix cache path slot Igor Sysoev <igor@sysoev.ru> parents: 2632 diff changeset	1923 goto invalid_levels;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1924 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1925
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1926 goto invalid_levels;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1927 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1928
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1929 if (cache->path->len < 10 + 3) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1930 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1931 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1932
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1933 invalid_levels:
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1934
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1935 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1936 "invalid \"levels\" \"%V\"", &value[i]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1937 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1938 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1939
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1940 if (ngx_strncmp(value[i].data, "keys_zone=", 10) == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1941
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1942 name.data = value[i].data + 10;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1943
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1944 p = (u_char *) ngx_strchr(name.data, ':');
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1945
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1946 if (p) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1947 name.len = p - name.data;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1948
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1949 p++;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1950
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1951 s.len = value[i].data + value[i].len - p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1952 s.data = p;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1953
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1954 size = ngx_parse_size(&s);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1955 if (size > 8191) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1956 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1957 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1958 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1959
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1960 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1961 "invalid keys zone size \"%V\"", &value[i]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1962 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1963 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1964
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1965 if (ngx_strncmp(value[i].data, "inactive=", 9) == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1966
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1967 s.len = value[i].len - 9;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1968 s.data = value[i].data + 9;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1969
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1970 inactive = ngx_parse_time(&s, 1);
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	1971 if (inactive == (time_t) NGX_ERROR) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1972 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1973 "invalid inactive value \"%V\"", &value[i]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1974 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1975 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1976
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1977 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1978 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1979
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1980 if (ngx_strncmp(value[i].data, "max_size=", 9) == 0) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1981
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1982 s.len = value[i].len - 9;
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1983 s.data = value[i].data + 9;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1984
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1985 max_size = ngx_parse_offset(&s);
d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1986 if (max_size < 0) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1987 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	1988 "invalid max_size value \"%V\"", &value[i]);
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1989 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1990 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1991
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1992 continue;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1993 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	1994
3974 d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1995 if (ngx_strncmp(value[i].data, "loader_files=", 13) == 0) {
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1996
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1997 loader_files = ngx_atoi(value[i].data + 13, value[i].len - 13);
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1998 if (loader_files == NGX_ERROR) {
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	1999 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2000 "invalid loader_files value \"%V\"", &value[i]);
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2001 return NGX_CONF_ERROR;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2002 }
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2003
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2004 continue;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2005 }
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2006
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2007 if (ngx_strncmp(value[i].data, "loader_sleep=", 13) == 0) {
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2008
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2009 s.len = value[i].len - 13;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2010 s.data = value[i].data + 13;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2011
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2012 loader_sleep = ngx_parse_time(&s, 0);
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	2013 if (loader_sleep == (ngx_msec_t) NGX_ERROR) {
3974 d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2014 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2015 "invalid loader_sleep value \"%V\"", &value[i]);
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2016 return NGX_CONF_ERROR;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2017 }
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2018
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2019 continue;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2020 }
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2021
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2022 if (ngx_strncmp(value[i].data, "loader_threshold=", 17) == 0) {
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2023
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2024 s.len = value[i].len - 17;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2025 s.data = value[i].data + 17;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2026
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2027 loader_threshold = ngx_parse_time(&s, 0);
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	2028 if (loader_threshold == (ngx_msec_t) NGX_ERROR) {
3974 d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2029 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2030 "invalid loader_threshold value \"%V\"", &value[i]);
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2031 return NGX_CONF_ERROR;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2032 }
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2033
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2034 continue;
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2035 }
d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2036
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2037 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2038 "invalid parameter \"%V\"", &value[i]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2039 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2040 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2041
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2042 if (name.len == 0 \|\| size == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2043 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2044 "\"%V\" must have \"keys_zone\" parameter",
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2045 &cmd->name);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2046 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2047 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2048
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	2049 cache->path->manager = ngx_http_file_cache_manager;
3018 8fc7b94f647b cache loader process Igor Sysoev <igor@sysoev.ru> parents: 3017 diff changeset	2050 cache->path->loader = ngx_http_file_cache_loader;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2051 cache->path->data = cache;
3973 9d6f21415231 set correct configuration file values while adding path Igor Sysoev <igor@sysoev.ru> parents: 3972 diff changeset	2052 cache->path->conf_file = cf->conf_file->file.name.data;
9d6f21415231 set correct configuration file values while adding path Igor Sysoev <igor@sysoev.ru> parents: 3972 diff changeset	2053 cache->path->line = cf->conf_file->line;
3974 d10bcb07d9d4 loader_files, loader_sleep, and loader_threshold Igor Sysoev <igor@sysoev.ru> parents: 3973 diff changeset	2054 cache->loader_files = loader_files;
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	2055 cache->loader_sleep = loader_sleep;
41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	2056 cache->loader_threshold = loader_threshold;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2057
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2058 if (ngx_add_path(cf, &cache->path) != NGX_OK) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2059 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2060 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2061
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2062 cache->shm_zone = ngx_shared_memory_add(cf, &name, size, cmd->post);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2063 if (cache->shm_zone == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2064 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2065 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2066
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2067 if (cache->shm_zone->data) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2068 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2069 "duplicate zone \"%V\"", &name);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2070 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2071 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2072
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2073
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2074 cache->shm_zone->init = ngx_http_file_cache_init;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2075 cache->shm_zone->data = cache;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2076
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2077 cache->inactive = inactive;
2616 d19979e0d980 introduce cache manager instead of cache cleaner Igor Sysoev <igor@sysoev.ru> parents: 2611 diff changeset	2078 cache->max_size = max_size;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2079
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2080 return NGX_CONF_OK;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2081 }
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	2082
ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	2083
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2084 char *
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2085 ngx_http_file_cache_valid_set_slot(ngx_conf_t cf, ngx_command_t cmd,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2086 void *conf)
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2087 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2088 char *p = conf;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2089
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2090 time_t valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2091 ngx_str_t *value;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2092 ngx_uint_t i, n, status;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2093 ngx_array_t **a;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2094 ngx_http_cache_valid_t *v;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2095 static ngx_uint_t statuses[] = { 200, 301, 302 };
477 ad1e9ebf93bb nginx-0.1.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	2096
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2097 a = (ngx_array_t **) (p + cmd->offset);
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2098
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2099 if (*a == NGX_CONF_UNSET_PTR) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2100 *a = ngx_array_create(cf->pool, 1, sizeof(ngx_http_cache_valid_t));
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2101 if (*a == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2102 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2103 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2104 }
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2105
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2106 value = cf->args->elts;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2107 n = cf->args->nelts - 1;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2108
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2109 valid = ngx_parse_time(&value[n], 1);
4474 41f640a693de Time parsing cleanup. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	2110 if (valid == (time_t) NGX_ERROR) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2111 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2112 "invalid time value \"%V\"", &value[n]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2113 return NGX_CONF_ERROR;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2114 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2115
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2116 if (n == 1) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2117
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2118 for (i = 0; i < 3; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2119 v = ngx_array_push(*a);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2120 if (v == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2121 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2122 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2123
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2124 v->status = statuses[i];
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2125 v->valid = valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2126 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2127
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2128 return NGX_CONF_OK;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2129 }
74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2130
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2131 for (i = 1; i < n; i++) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2132
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2133 if (ngx_strcmp(value[i].data, "any") == 0) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2134
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2135 status = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2136
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2137 } else {
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2138
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2139 status = ngx_atoi(value[i].data, value[i].len);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2140 if (status < 100) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2141 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2142 "invalid status \"%V\"", &value[i]);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2143 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2144 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2145 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2146
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2147 v = ngx_array_push(*a);
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2148 if (v == NULL) {
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2149 return NGX_CONF_ERROR;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2150 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2151
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2152 v->status = status;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2153 v->valid = valid;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2154 }
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2155
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 633 diff changeset	2156 return NGX_CONF_OK;
202 74994aeef848 nginx-0.0.1-2003-12-01-19:28:14 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	2157 }

Mercurial > hg > nginx

annotate src/http/ngx_http_file_cache.c @ 5879:c525c0454aa5