nginx: src/http/ngx_http_file

annotate src/http/ngx_http_file_cache.c @ 5245:711fa02afae8

Valgrind: supressed complaints about uninitialized bytes. Valgrind complains if we pass uninitialized memory to a syscall: ==36492== Syscall param sendmsg(msg.msg_iov[0]) points to uninitialised byte(s) ==36492== at 0x6B5E6A: sendmsg (in /usr/lib/system/libsystem_kernel.dylib) ==36492== by 0x10004288E: ngx_signal_worker_processes (ngx_process_cycle.c:527) ==36492== by 0x1000417A7: ngx_master_process_cycle (ngx_process_cycle.c:203) ==36492== by 0x100001F10: main (nginx.c:410) ==36492== Address 0x7fff5fbff71c is on thread 1's stack Even initialization of all members of the structure passed isn't enough, as there is padding which still remains uninitialized and results in Valgrind complaint. Note there is no real problem here as data from uninitialized memory isn't used.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Wed, 05 Jun 2013 19:44:22 +0400
parents	9ea42922a395
children	f1a91825730a

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

Mercurial > hg > nginx

annotate src/http/ngx_http_file_cache.c @ 5245:711fa02afae8