mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 12:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

loader_files, loader_sleep, and loader_threshold

Browse Source
This commit is contained in:
Igor Sysoev 2011-07-29 15:09:02 +00:00
parent d5a25a4b97
commit 922f106582
2 changed files with 71 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/http/ngx_http_cache.h
View File

@ -118,8 +118,11 @@ struct ngx_http_file_cache_s {
time_t inactive; time_t inactive;
ngx_msec_t last;
ngx_uint_t files; ngx_uint_t files;
ngx_uint_t loader_files;
ngx_msec_t last;
ngx_msec_t loader_sleep;
ngx_msec_t loader_threshold;
ngx_shm_zone_t *shm_zone; ngx_shm_zone_t *shm_zone;
}; };

78
src/http/ngx_http_file_cache.c
View File

@ -1265,28 +1265,35 @@ ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache)
{ {
ngx_msec_t elapsed; ngx_msec_t elapsed;
if (cache->files++ > 100) { if (++cache->files >= cache->loader_files) {
ngx_time_update(); ngx_time_update();
elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last)); elapsed = ngx_abs((ngx_msec_int_t) (ngx_current_msec - cache->last));
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
"http file cache manager time: %M", elapsed); "http file cache loader time elapsed: %M", elapsed);
if (elapsed > 200) { if (elapsed >= cache->loader_threshold) {
/* if (cache->loader_files > 1) {
* if processing 100 files takes more than 200ms, cache->loader_files /= 2;
* it seems that many operations require disk i/o, ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
* therefore sleep 200ms "cache %V loader_files decreased to %ui",
*/ &cache->path->name, cache->loader_files);
ngx_msleep(200); } else {
cache->loader_sleep *= 2;
ngx_time_update(); 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->last = ngx_current_msec;
cache->files = 0; cache->files = 0;
} }
@ -1462,6 +1469,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
time_t inactive; time_t inactive;
ssize_t size; ssize_t size;
ngx_str_t s, name, *value; ngx_str_t s, name, *value;
ngx_int_t loader_files, loader_sleep, loader_threshold;
ngx_uint_t i, n; ngx_uint_t i, n;
ngx_http_file_cache_t *cache; ngx_http_file_cache_t *cache;
@ -1476,6 +1484,9 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
} }
inactive = 600; inactive = 600;
loader_files = 100;
loader_sleep = 50;
loader_threshold = 200;
name.len = 0; name.len = 0;
size = 0; size = 0;
@ -1589,6 +1600,48 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue; continue;
} }
if (ngx_strncmp(value[i].data, "loader_files=", 13) == 0) {
loader_files = ngx_atoi(value[i].data + 13, value[i].len - 13);
if (loader_files == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid loader_files value \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}
continue;
}
if (ngx_strncmp(value[i].data, "loader_sleep=", 13) == 0) {
s.len = value[i].len - 13;
s.data = value[i].data + 13;
loader_sleep = ngx_parse_time(&s, 0);
if (loader_sleep < 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid loader_sleep value \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}
continue;
}
if (ngx_strncmp(value[i].data, "loader_threshold=", 17) == 0) {
s.len = value[i].len - 17;
s.data = value[i].data + 17;
loader_threshold = ngx_parse_time(&s, 0);
if (loader_threshold < 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid loader_threshold value \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}
continue;
}
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid parameter \"%V\"", &value[i]); "invalid parameter \"%V\"", &value[i]);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -1606,6 +1659,9 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cache->path->data = cache; cache->path->data = cache;
cache->path->conf_file = cf->conf_file->file.name.data; cache->path->conf_file = cf->conf_file->file.name.data;
cache->path->line = cf->conf_file->line; cache->path->line = cf->conf_file->line;
cache->loader_files = loader_files;
cache->loader_sleep = (ngx_msec_t) loader_sleep;
cache->loader_threshold = (ngx_msec_t) loader_threshold;
if (ngx_add_path(cf, &cache->path) != NGX_OK) { if (ngx_add_path(cf, &cache->path) != NGX_OK) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;