Mercurial > hg > nginx
changeset 6734:0c572ed91b36
Modules compatibility: compatibility with NGX_HAVE_FILE_AIO.
With this change it is now possible to load modules compiled without
the "--with-file-aio" configure option into nginx binary compiled with it,
and vice versa, assuming both use the "--with-compat" option.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 10 Oct 2016 18:44:17 +0300 |
parents | adc2414856b1 |
children | e38e9c50a40e |
files | src/core/ngx_buf.h src/core/ngx_connection.h src/core/ngx_file.h src/core/ngx_module.h src/event/ngx_event.h src/http/ngx_http_core_module.c |
diffstat | 6 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_buf.h Mon Oct 10 18:44:17 2016 +0300 +++ b/src/core/ngx_buf.h Mon Oct 10 18:44:17 2016 +0300 @@ -72,10 +72,8 @@ typedef ngx_int_t (*ngx_output_chain_filter_pt)(void *ctx, ngx_chain_t *in); -#if (NGX_HAVE_FILE_AIO) typedef void (*ngx_output_chain_aio_pt)(ngx_output_chain_ctx_t *ctx, ngx_file_t *file); -#endif struct ngx_output_chain_ctx_s { ngx_buf_t *buf; @@ -90,9 +88,9 @@ unsigned need_in_temp:1; unsigned aio:1; -#if (NGX_HAVE_FILE_AIO) +#if (NGX_HAVE_FILE_AIO || NGX_COMPAT) ngx_output_chain_aio_pt aio_handler; -#if (NGX_HAVE_AIO_SENDFILE) +#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) ssize_t (*aio_preload)(ngx_buf_t *file); #endif #endif
--- a/src/core/ngx_connection.h Mon Oct 10 18:44:17 2016 +0300 +++ b/src/core/ngx_connection.h Mon Oct 10 18:44:17 2016 +0300 @@ -182,7 +182,7 @@ unsigned need_last_buf:1; -#if (NGX_HAVE_AIO_SENDFILE) +#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) unsigned busy_count:2; #endif
--- a/src/core/ngx_file.h Mon Oct 10 18:44:17 2016 +0300 +++ b/src/core/ngx_file.h Mon Oct 10 18:44:17 2016 +0300 @@ -30,7 +30,7 @@ ngx_thread_task_t *thread_task; #endif -#if (NGX_HAVE_FILE_AIO) +#if (NGX_HAVE_FILE_AIO || NGX_COMPAT) ngx_event_aio_t *aio; #endif
--- a/src/core/ngx_module.h Mon Oct 10 18:44:17 2016 +0300 +++ b/src/core/ngx_module.h Mon Oct 10 18:44:17 2016 +0300 @@ -35,13 +35,13 @@ #define NGX_MODULE_SIGNATURE_2 "0" #endif -#if (NGX_HAVE_FILE_AIO) +#if (NGX_HAVE_FILE_AIO || NGX_COMPAT) #define NGX_MODULE_SIGNATURE_3 "1" #else #define NGX_MODULE_SIGNATURE_3 "0" #endif -#if (NGX_HAVE_AIO_SENDFILE) +#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) #define NGX_MODULE_SIGNATURE_4 "1" #else #define NGX_MODULE_SIGNATURE_4 "0"
--- a/src/event/ngx_event.h Mon Oct 10 18:44:17 2016 +0300 +++ b/src/event/ngx_event.h Mon Oct 10 18:44:17 2016 +0300 @@ -152,7 +152,7 @@ ngx_event_handler_pt handler; ngx_file_t *file; -#if (NGX_HAVE_AIO_SENDFILE) +#if (NGX_HAVE_AIO_SENDFILE || NGX_COMPAT) ssize_t (*preload_handler)(ngx_buf_t *file); #endif
--- a/src/http/ngx_http_core_module.c Mon Oct 10 18:44:17 2016 +0300 +++ b/src/http/ngx_http_core_module.c Mon Oct 10 18:44:17 2016 +0300 @@ -3760,10 +3760,8 @@ ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); ngx_conf_merge_size_value(conf->sendfile_max_chunk, prev->sendfile_max_chunk, 0); -#if (NGX_HAVE_FILE_AIO || NGX_THREADS) ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF); ngx_conf_merge_value(conf->aio_write, prev->aio_write, 0); -#endif #if (NGX_THREADS) ngx_conf_merge_ptr_value(conf->thread_pool, prev->thread_pool, NULL); ngx_conf_merge_ptr_value(conf->thread_pool_value, prev->thread_pool_value,