Mercurial > hg > nginx
changeset 2129:25add486e7aa
directio
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 30 Jul 2008 12:34:04 +0000 |
parents | 345a014436d4 |
children | bbcf6d75556f |
files | auto/os/features src/core/ngx_open_file_cache.c src/core/ngx_open_file_cache.h src/core/ngx_output_chain.c src/core/ngx_palloc.c src/core/ngx_palloc.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_script.c src/os/unix/ngx_alloc.h src/os/unix/ngx_files.c src/os/unix/ngx_files.h src/os/win32/ngx_files.h |
diffstat | 18 files changed, 165 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/os/features Wed Jul 30 12:18:07 2008 +0000 +++ b/auto/os/features Wed Jul 30 12:34:04 2008 +0000 @@ -170,3 +170,23 @@ CRYPT_LIB="-lcrypt" fi fi + + +ngx_feature="O_DIRECT" +ngx_feature_name="NGX_HAVE_O_DIRECT" +ngx_feature_run=no +ngx_feature_incs="#include <fcntl.h>" +ngx_feature_path= +ngx_feature_libs= +ngx_feature_test="fcntl(0, F_SETFL, O_DIRECT);" +. auto/feature + + +ngx_feature="F_NOCACHE" +ngx_feature_name="NGX_HAVE_F_NOCACHE" +ngx_feature_run=no +ngx_feature_incs="#include <fcntl.h>" +ngx_feature_path= +ngx_feature_libs= +ngx_feature_test="fcntl(0, F_NOCACHE, 1);" +. auto/feature
--- a/src/core/ngx_open_file_cache.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/core/ngx_open_file_cache.c Wed Jul 30 12:34:04 2008 +0000 @@ -497,6 +497,13 @@ } else { of->fd = fd; + + if (of->directio <= ngx_file_size(&fi)) { + if (ngx_directio(fd) == -1) { + ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, + ngx_directio_n " \"%s\" failed", name); + } + } } done:
--- a/src/core/ngx_open_file_cache.h Wed Jul 30 12:18:07 2008 +0000 +++ b/src/core/ngx_open_file_cache.h Wed Jul 30 12:34:04 2008 +0000 @@ -17,6 +17,7 @@ ngx_file_uniq_t uniq; time_t mtime; off_t size; + off_t directio; ngx_err_t err; time_t valid;
--- a/src/core/ngx_output_chain.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/core/ngx_output_chain.c Wed Jul 30 12:34:04 2008 +0000 @@ -32,6 +32,7 @@ size_t size; ngx_int_t rc, last; ngx_uint_t recycled; + ngx_buf_t *b; ngx_chain_t *cl, *out, **last_out; if (ctx->in == NULL && ctx->busy == NULL) { @@ -161,13 +162,29 @@ } } - ctx->buf = ngx_create_temp_buf(ctx->pool, size); - if (ctx->buf == NULL) { + b = ngx_calloc_buf(ctx->pool); + if (b == NULL) { return NGX_ERROR; } - ctx->buf->tag = ctx->tag; - ctx->buf->recycled = recycled; + /* + * allocate block aligned to a disk sector size + * to enable O_DIRECT + */ + + b->start = ngx_pmemalign(ctx->pool, size, 512); + if (b->start == NULL) { + return NGX_ERROR; + } + + b->pos = b->start; + b->last = b->start; + b->end = b->last + size; + b->temporary = 1; + b->tag = ctx->tag; + b->recycled = recycled; + + ctx->buf = b; ctx->allocated++; } }
--- a/src/core/ngx_palloc.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/core/ngx_palloc.c Wed Jul 30 12:34:04 2008 +0000 @@ -195,17 +195,35 @@ void *p; ngx_pool_large_t *large; -#if 0 - p = ngx_memalign(ngx_pagesize, size, pool->log); - if (p == NULL) { - return NULL; - } -#else p = ngx_alloc(size, pool->log); if (p == NULL) { return NULL; } -#endif + + large = ngx_palloc(pool, sizeof(ngx_pool_large_t)); + if (large == NULL) { + ngx_free(p); + return NULL; + } + + large->alloc = p; + large->next = pool->large; + pool->large = large; + + return p; +} + + +void * +ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment) +{ + void *p; + ngx_pool_large_t *large; + + p = ngx_memalign(alignment, size, pool->log); + if (p == NULL) { + return NULL; + } large = ngx_palloc(pool, sizeof(ngx_pool_large_t)); if (large == NULL) {
--- a/src/core/ngx_palloc.h Wed Jul 30 12:18:07 2008 +0000 +++ b/src/core/ngx_palloc.h Wed Jul 30 12:34:04 2008 +0000 @@ -77,6 +77,7 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size); void *ngx_pnalloc(ngx_pool_t *pool, size_t size); void *ngx_pcalloc(ngx_pool_t *pool, size_t size); +void *ngx_pmemalign(ngx_pool_t *pool, size_t size, size_t alignment); ngx_int_t ngx_pfree(ngx_pool_t *pool, void *p);
--- a/src/http/modules/ngx_http_flv_module.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/modules/ngx_http_flv_module.c Wed Jul 30 12:34:04 2008 +0000 @@ -107,6 +107,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors;
--- a/src/http/modules/ngx_http_gzip_static_module.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/modules/ngx_http_gzip_static_module.c Wed Jul 30 12:34:04 2008 +0000 @@ -121,6 +121,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors;
--- a/src/http/modules/ngx_http_index_module.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/modules/ngx_http_index_module.c Wed Jul 30 12:34:04 2008 +0000 @@ -210,6 +210,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors;
--- a/src/http/modules/ngx_http_static_module.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/modules/ngx_http_static_module.c Wed Jul 30 12:34:04 2008 +0000 @@ -98,6 +98,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors;
--- a/src/http/modules/perl/nginx.xs Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/modules/perl/nginx.xs Wed Jul 30 12:34:04 2008 +0000 @@ -652,6 +652,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors;
--- a/src/http/ngx_http_core_module.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/ngx_http_core_module.c Wed Jul 30 12:34:04 2008 +0000 @@ -54,6 +54,8 @@ static char *ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); static char *ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); +static char *ngx_http_core_directio(ngx_conf_t *cf, ngx_command_t *cmd, + void *conf); static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); static char *ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, @@ -353,6 +355,13 @@ offsetof(ngx_http_core_loc_conf_t, sendfile_max_chunk), NULL }, + { ngx_string("directio"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_http_core_directio, + NGX_HTTP_LOC_CONF_OFFSET, + 0, + NULL }, + { ngx_string("tcp_nopush"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, ngx_conf_set_flag_slot, @@ -2586,6 +2595,7 @@ lcf->client_body_in_file_only = NGX_CONF_UNSET; lcf->sendfile = NGX_CONF_UNSET; lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE; + lcf->directio = NGX_CONF_UNSET; lcf->tcp_nopush = NGX_CONF_UNSET; lcf->tcp_nodelay = NGX_CONF_UNSET; lcf->send_timeout = NGX_CONF_UNSET_MSEC; @@ -2774,6 +2784,8 @@ ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); ngx_conf_merge_size_value(conf->sendfile_max_chunk, prev->sendfile_max_chunk, 0); + ngx_conf_merge_off_value(conf->directio, prev->directio, + NGX_MAX_OFF_T_VALUE); ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0); ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1); @@ -3340,6 +3352,33 @@ static char * +ngx_http_core_directio(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) +{ + ngx_http_core_loc_conf_t *clcf = conf; + + ngx_str_t *value; + + if (clcf->directio != NGX_CONF_UNSET) { + return "is duplicate"; + } + + value = cf->args->elts; + + if (ngx_strcmp(value[1].data, "off") == 0) { + clcf->directio = NGX_MAX_OFF_T_VALUE; + return NGX_CONF_OK; + } + + clcf->directio = ngx_parse_offset(&value[1]); + if (clcf->directio == (off_t) NGX_ERROR) { + return "invalid value"; + } + + return NGX_CONF_OK; +} + + +static char * ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { ngx_http_core_loc_conf_t *lcf = conf;
--- a/src/http/ngx_http_core_module.h Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/ngx_http_core_module.h Wed Jul 30 12:34:04 2008 +0000 @@ -265,6 +265,7 @@ ngx_str_t default_type; off_t client_max_body_size; /* client_max_body_size */ + off_t directio; /* directio */ size_t client_body_buffer_size; /* client_body_buffer_size */ size_t send_lowat; /* send_lowat */
--- a/src/http/ngx_http_script.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/http/ngx_http_script.c Wed Jul 30 12:34:04 2008 +0000 @@ -996,6 +996,7 @@ ngx_memzero(&of, sizeof(ngx_open_file_info_t)); + of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; of.errors = clcf->open_file_cache_errors;
--- a/src/os/unix/ngx_alloc.h Wed Jul 30 12:18:07 2008 +0000 +++ b/src/os/unix/ngx_alloc.h Wed Jul 30 12:34:04 2008 +0000 @@ -21,8 +21,8 @@ /* * Linux has memalign() or posix_memalign() * Solaris has memalign() - * FreeBSD has not memalign() or posix_memalign() but its malloc() alignes - * allocations bigger than page size at the page boundary. + * FreeBSD 7.0 has posix_memalign(), besides, early version's malloc() + * aligns allocations bigger than page size at the page boundary */ #if (NGX_HAVE_POSIX_MEMALIGN || NGX_HAVE_MEMALIGN)
--- a/src/os/unix/ngx_files.c Wed Jul 30 12:18:07 2008 +0000 +++ b/src/os/unix/ngx_files.c Wed Jul 30 12:34:04 2008 +0000 @@ -351,3 +351,22 @@ return 0; } + + +#if (NGX_HAVE_O_DIRECT) + +ngx_int_t +ngx_directio(ngx_fd_t fd) +{ + int flags; + + flags = fcntl(fd, F_GETFL); + + if (flags == -1) { + return -1; + } + + return fcntl(fd, F_SETFL, flags | O_DIRECT); +} + +#endif
--- a/src/os/unix/ngx_files.h Wed Jul 30 12:18:07 2008 +0000 +++ b/src/os/unix/ngx_files.h Wed Jul 30 12:34:04 2008 +0000 @@ -189,4 +189,22 @@ #define ngx_unlock_fd_n "fcntl(F_SETLK, F_UNLCK)" +#if (NGX_HAVE_O_DIRECT) + +ngx_int_t ngx_directio(ngx_fd_t fd); +#define ngx_directio_n "fcntl(O_DIRECT)" + +#elif (NGX_HAVE_F_NOCACHE) + +#define ngx_directio(fd) fcntl(fd, F_NOCACHE, 1) +#define ngx_directio_n "fcntl(F_NOCACHE)" + +#else + +#define ngx_directio(fd) 0 +#define ngx_directio_n "ngx_directio_n" + +#endif + + #endif /* _NGX_FILES_H_INCLUDED_ */
--- a/src/os/win32/ngx_files.h Wed Jul 30 12:18:07 2008 +0000 +++ b/src/os/win32/ngx_files.h Wed Jul 30 12:34:04 2008 +0000 @@ -200,7 +200,7 @@ ngx_int_t ngx_open_glob(ngx_glob_t *gl); -#define ngx_open_glob_n "FindFirstFile()" +#define ngx_open_glob_n "FindFirstFile()" ngx_int_t ngx_read_glob(ngx_glob_t *gl, ngx_str_t *name); void ngx_close_glob(ngx_glob_t *gl); @@ -216,4 +216,8 @@ off_t offset, ngx_pool_t *pool); +#define ngx_directio(fd) 0 +#define ngx_directio_n "ngx_directio_n" + + #endif /* _NGX_FILES_H_INCLUDED_ */