Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http_file_cache.c @ 634:23ef0645ea57 NGINX_1_1_1
nginx 1.1.1
*) Change: now cache loader processes either as many files as specified
by "loader_files" parameter or works no more than time specified by
"loader_threshold" parameter during each iteration.
*) Change: now SIGWINCH signal works only in deamon mode.
*) Feature: now shared zones and caches use POSIX semaphores on
Solaris.
Thanks to Den Ivanov.
*) Feature: accept filters are now supported on NetBSD.
*) Bugfix: nginx could not be build on Linux 3.0.
*) Bugfix: nginx did not use gzipping in some cases; the bug had
appeared in 1.1.0.
*) Bugfix: request body might be incorrectly processed if client used
pipelining.
*) Bugfix: in the "request_body_in_single_buf" directive.
*) Bugfix: in "proxy_set_body" and "proxy_pass_request_body" directives
if SSL connection to backend was used.
*) Bugfix: nginx hogged CPU if all servers in an upstream were marked
as "down".
*) Bugfix: a segmentation fault might occur during reconfiguration if
ssl_session_cache was defined but not used in a previous
configuration.
*) Bugfix: a segmentation fault might occur in a worker process if many
backup servers were used in an upstream.
*) Bugfix: a segmentation fault might occur in a worker process if
"fastcgi/scgi/uwsgi_param" directives were used with values starting
with "HTTP_"; the bug had appeared in 0.8.40.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 22 Aug 2011 00:00:00 +0400 |
parents | 5b73504dd4ba |
children | 943566b4d82e |
line wrap: on
line diff
--- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -30,8 +30,7 @@ static time_t ngx_http_file_cache_forced static time_t ngx_http_file_cache_expire(ngx_http_file_cache_t *cache); static void ngx_http_file_cache_delete(ngx_http_file_cache_t *cache, ngx_queue_t *q, u_char *name); -static ngx_int_t - ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache); +static void ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache); static ngx_int_t ngx_http_file_cache_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path); static ngx_int_t ngx_http_file_cache_manage_file(ngx_tree_ctx_t *ctx, @@ -1261,48 +1260,6 @@ ngx_http_file_cache_loader(void *data) static ngx_int_t -ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache) -{ - ngx_msec_t elapsed; - - if (++cache->files >= cache->loader_files) { - - ngx_time_update(); - - elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last)); - - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, - "http file cache loader time elapsed: %M", elapsed); - - if (elapsed >= cache->loader_threshold) { - - if (cache->loader_files > 1) { - cache->loader_files /= 2; - ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, - "cache %V loader_files decreased to %ui", - &cache->path->name, cache->loader_files); - - } else { - cache->loader_sleep *= 2; - ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0, - "cache %V loader_sleep increased to %Mms", - &cache->path->name, cache->loader_sleep); - } - } - - ngx_msleep(cache->loader_sleep); - - ngx_time_update(); - - cache->last = ngx_current_msec; - cache->files = 0; - } - - return (ngx_quit || ngx_terminate) ? NGX_ABORT : NGX_OK; -} - - -static ngx_int_t ngx_http_file_cache_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path) { return NGX_OK; @@ -1312,6 +1269,7 @@ ngx_http_file_cache_noop(ngx_tree_ctx_t static ngx_int_t ngx_http_file_cache_manage_file(ngx_tree_ctx_t *ctx, ngx_str_t *path) { + ngx_msec_t elapsed; ngx_http_file_cache_t *cache; cache = ctx->data; @@ -1320,7 +1278,35 @@ ngx_http_file_cache_manage_file(ngx_tree (void) ngx_http_file_cache_delete_file(ctx, path); } - return ngx_http_file_cache_loader_sleep(cache); + if (++cache->files >= cache->loader_files) { + ngx_http_file_cache_loader_sleep(cache); + + } else { + ngx_time_update(); + + elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last)); + + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, + "http file cache loader time elapsed: %M", elapsed); + + if (elapsed >= cache->loader_threshold) { + ngx_http_file_cache_loader_sleep(cache); + } + } + + return (ngx_quit || ngx_terminate) ? NGX_ABORT : NGX_OK; +} + + +static void +ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache) +{ + ngx_msleep(cache->loader_sleep); + + ngx_time_update(); + + cache->last = ngx_current_msec; + cache->files = 0; }