Mercurial > hg > nginx
changeset 3178:975f0558aab3
read_ahead
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 30 Sep 2009 13:21:52 +0000 |
parents | adc4fc0c3cc3 |
children | 74b74513ed59 |
files | auto/os/features src/core/ngx_open_file_cache.c src/core/ngx_open_file_cache.h src/http/modules/ngx_http_flv_module.c src/http/modules/ngx_http_gzip_static_module.c src/http/modules/ngx_http_index_module.c src/http/modules/ngx_http_static_module.c src/http/modules/perl/nginx.xs src/http/ngx_http_core_module.c src/http/ngx_http_core_module.h src/http/ngx_http_file_cache.c src/http/ngx_http_script.c src/os/unix/ngx_files.h src/os/win32/ngx_files.c src/os/win32/ngx_files.h |
diffstat | 15 files changed, 79 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/os/features Wed Sep 30 12:56:44 2009 +0000 +++ b/auto/os/features Wed Sep 30 13:21:52 2009 +0000 @@ -172,6 +172,26 @@ fi +ngx_feature="F_READAHEAD" +ngx_feature_name="NGX_HAVE_F_READAHEAD" +ngx_feature_run=no +ngx_feature_incs="#include <fcntl.h>" +ngx_feature_path= +ngx_feature_libs= +ngx_feature_test="fcntl(0, F_READAHEAD, 1);" +. auto/feature + + +ngx_feature="posix_fadvise()" +ngx_feature_name="NGX_HAVE_POSIX_FADVISE" +ngx_feature_run=no +ngx_feature_incs="#include <fcntl.h>" +ngx_feature_path= +ngx_feature_libs= +ngx_feature_test="posix_fadvise(0, 0, 0, POSIX_FADV_SEQUENTIAL);" +. auto/feature + + ngx_feature="O_DIRECT" ngx_feature_name="NGX_HAVE_O_DIRECT" ngx_feature_run=no
--- a/src/core/ngx_open_file_cache.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/core/ngx_open_file_cache.c Wed Sep 30 13:21:52 2009 +0000 @@ -17,6 +17,9 @@ */ +#define NGX_MIN_READ_AHEAD (128 * 1024) + + static void ngx_open_file_cache_cleanup(void *data); static ngx_int_t ngx_open_and_stat_file(u_char *name, ngx_open_file_info_t *of, ngx_log_t *log); @@ -524,6 +527,13 @@ } else { of->fd = fd; + if (of->read_ahead && ngx_file_size(&fi) > NGX_MIN_READ_AHEAD) { + if (ngx_read_ahead(fd, of->read_ahead) == NGX_ERROR) { + ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, + ngx_read_ahead_n " \"%s\" failed", name); + } + } + if (of->directio <= ngx_file_size(&fi)) { if (ngx_directio_on(fd) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
--- a/src/core/ngx_open_file_cache.h Wed Sep 30 12:56:44 2009 +0000 +++ b/src/core/ngx_open_file_cache.h Wed Sep 30 13:21:52 2009 +0000 @@ -21,6 +21,7 @@ time_t mtime; off_t size; off_t directio; + size_t read_ahead; ngx_err_t err; char *failed;
--- a/src/http/modules/ngx_http_flv_module.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/modules/ngx_http_flv_module.c Wed Sep 30 13:21:52 2009 +0000 @@ -106,6 +106,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.read_ahead = clcf->read_ahead; of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses;
--- a/src/http/modules/ngx_http_gzip_static_module.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/modules/ngx_http_gzip_static_module.c Wed Sep 30 13:21:52 2009 +0000 @@ -124,6 +124,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.read_ahead = clcf->read_ahead; of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses;
--- a/src/http/modules/ngx_http_index_module.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/modules/ngx_http_index_module.c Wed Sep 30 13:21:52 2009 +0000 @@ -205,6 +205,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.read_ahead = clcf->read_ahead; of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses;
--- a/src/http/modules/ngx_http_static_module.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/modules/ngx_http_static_module.c Wed Sep 30 13:21:52 2009 +0000 @@ -91,6 +91,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.read_ahead = clcf->read_ahead; of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses;
--- a/src/http/modules/perl/nginx.xs Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/modules/perl/nginx.xs Wed Sep 30 13:21:52 2009 +0000 @@ -648,6 +648,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.read_ahead = clcf->read_ahead; of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses;
--- a/src/http/ngx_http_core_module.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/ngx_http_core_module.c Wed Sep 30 13:21:52 2009 +0000 @@ -408,6 +408,13 @@ #endif + { ngx_string("read_ahead"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_core_loc_conf_t, read_ahead), + NULL }, + { ngx_string("directio"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_http_core_directio, @@ -2957,6 +2964,7 @@ #if (NGX_HAVE_FILE_AIO) lcf->aio = NGX_CONF_UNSET; #endif + lcf->read_ahead = NGX_CONF_UNSET_SIZE; lcf->directio = NGX_CONF_UNSET; lcf->directio_alignment = NGX_CONF_UNSET; lcf->tcp_nopush = NGX_CONF_UNSET; @@ -3158,6 +3166,7 @@ #if (NGX_HAVE_FILE_AIO) ngx_conf_merge_value(conf->aio, prev->aio, 0); #endif + ngx_conf_merge_size_value(conf->read_ahead, prev->read_ahead, 0); ngx_conf_merge_off_value(conf->directio, prev->directio, NGX_MAX_OFF_T_VALUE); ngx_conf_merge_off_value(conf->directio_alignment, prev->directio_alignment,
--- a/src/http/ngx_http_core_module.h Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/ngx_http_core_module.h Wed Sep 30 13:21:52 2009 +0000 @@ -332,6 +332,7 @@ size_t limit_rate; /* limit_rate */ size_t limit_rate_after; /* limit_rate_after */ size_t sendfile_max_chunk; /* sendfile_max_chunk */ + size_t read_ahead; /* read_ahead */ ngx_msec_t client_body_timeout; /* client_body_timeout */ ngx_msec_t send_timeout; /* send_timeout */
--- a/src/http/ngx_http_file_cache.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/ngx_http_file_cache.c Wed Sep 30 13:21:52 2009 +0000 @@ -281,6 +281,7 @@ of.min_uses = clcf->open_file_cache_min_uses; of.events = clcf->open_file_cache_events; of.directio = NGX_OPEN_FILE_DIRECTIO_OFF; + of.read_ahead = clcf->read_ahead; if (ngx_open_cached_file(clcf->open_file_cache, &c->file.name, &of, r->pool) != NGX_OK)
--- a/src/http/ngx_http_script.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/http/ngx_http_script.c Wed Sep 30 13:21:52 2009 +0000 @@ -1407,6 +1407,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.read_ahead = clcf->read_ahead; of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses;
--- a/src/os/unix/ngx_files.h Wed Sep 30 12:56:44 2009 +0000 +++ b/src/os/unix/ngx_files.h Wed Sep 30 13:21:52 2009 +0000 @@ -254,6 +254,28 @@ #define ngx_unlock_fd_n "fcntl(F_SETLK, F_UNLCK)" +#if (NGX_HAVE_F_READAHEAD) + +#define NGX_HAVE_READ_AHEAD 1 + +#define ngx_read_ahead(fd, n) fcntl(fd, F_READAHEAD, (int) n) +#define ngx_read_ahead_n "fcntl(fd, F_READAHEAD)" + +#elif (NGX_HAVE_POSIX_FADVISE) + +#define NGX_HAVE_READ_AHEAD 1 + +#define ngx_read_ahead(fd, n) posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL) +#define ngx_read_ahead_n "posix_fadvise(POSIX_FADV_SEQUENTIAL)" + +#else + +#define ngx_read_ahead(fd, n) 0 +#define ngx_read_ahead_n "ngx_read_ahead_n" + +#endif + + #if (NGX_HAVE_O_DIRECT) ngx_int_t ngx_directio_on(ngx_fd_t fd);
--- a/src/os/win32/ngx_files.c Wed Sep 30 12:56:44 2009 +0000 +++ b/src/os/win32/ngx_files.c Wed Sep 30 13:21:52 2009 +0000 @@ -477,6 +477,13 @@ ngx_int_t +ngx_read_ahead(ngx_fd_t fd, size_t n) +{ + return ~NGX_FILE_ERROR; +} + + +ngx_int_t ngx_directio_on(ngx_fd_t fd) { return ~NGX_FILE_ERROR;
--- a/src/os/win32/ngx_files.h Wed Sep 30 12:56:44 2009 +0000 +++ b/src/os/win32/ngx_files.h Wed Sep 30 13:21:52 2009 +0000 @@ -232,6 +232,8 @@ ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *ce, off_t offset, ngx_pool_t *pool); +ngx_int_t ngx_read_ahead(ngx_fd_t fd, size_t n); +#define ngx_read_ahead_n "ngx_read_ahead_n" ngx_int_t ngx_directio_on(ngx_fd_t fd); #define ngx_directio_on_n "ngx_directio_on_n"