nginx: src/http/ngx_http_file

annotate src/http/ngx_http_file_cache.c @ 5822:063f7e75f9ef

Upstream: suppressed the file cache slab allocator error messages. The messages "ngx_slab_alloc() failed: no memory in cache keys zone" from the file cache slab allocator are suppressed since the allocation is likely to succeed after the forced expiration of cache nodes. The second allocation failure is reported.

author	Roman Arutyunyan <arut@nginx.com>
date	Fri, 05 Sep 2014 18:14:59 +0400
parents	44b9ab7752e3
children	2c89956b6a76

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

Mercurial > hg > nginx

annotate src/http/ngx_http_file_cache.c @ 5822:063f7e75f9ef