diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-04-22 18:57:32 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-04-22 18:57:32 +0300 |
| commit | c1882d9f3f05f39468ebbc00c5f21f01ec691fd9 (patch) | |
| tree | e953b78212100ea39278241f6f3644771a2b887c /auto | |
| parent | 39386c951c6e2e898b4871156e61227c348e8bba (diff) | |
| download | nginx-c1882d9f3f05f39468ebbc00c5f21f01ec691fd9.tar.gz nginx-c1882d9f3f05f39468ebbc00c5f21f01ec691fd9.tar.bz2 | |
Removed the obsolete aio module.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/options | 2 | ||||
| -rw-r--r-- | auto/os/freebsd | 20 | ||||
| -rw-r--r-- | auto/os/win32 | 1 | ||||
| -rw-r--r-- | auto/sources | 7 |
4 files changed, 0 insertions, 30 deletions
diff --git a/auto/options b/auto/options index 62f7d1829..6779cbdf9 100644 --- a/auto/options +++ b/auto/options @@ -41,7 +41,6 @@ EVENT_FOUND=NO EVENT_RTSIG=NO EVENT_SELECT=NO EVENT_POLL=NO -EVENT_AIO=NO USE_THREADS=NO @@ -195,7 +194,6 @@ do --without-select_module) EVENT_SELECT=NONE ;; --with-poll_module) EVENT_POLL=YES ;; --without-poll_module) EVENT_POLL=NONE ;; - --with-aio_module) EVENT_AIO=YES ;; --with-threads) USE_THREADS=YES ;; diff --git a/auto/os/freebsd b/auto/os/freebsd index 6c696326b..937ca204e 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -99,26 +99,6 @@ then fi -if [ $EVENT_AIO = YES ]; then - if [ \( $version -lt 500000 -a $version -ge 430000 \) \ - -o $version -ge 500014 ] - then - have=NGX_HAVE_AIO . auto/have - EVENT_MODULES="$EVENT_MODULES $AIO_MODULE" - CORE_SRCS="$CORE_SRCS $AIO_SRCS" - else - -cat << END - -$0: error: the kqueue does not support AIO on this FreeBSD version - -END - - exit 1 - fi -fi - - # cpuset_setaffinity() if [ $version -ge 701000 ]; then diff --git a/auto/os/win32 b/auto/os/win32 index 0b9b46187..82fc212f8 100644 --- a/auto/os/win32 +++ b/auto/os/win32 @@ -36,5 +36,4 @@ if [ $NGX_IPV6 = YES ]; then have=NGX_HAVE_INET6 . auto/have fi -have=NGX_HAVE_AIO . auto/have have=NGX_HAVE_IOCP . auto/have diff --git a/auto/sources b/auto/sources index d824cb9ed..2d50eda7c 100644 --- a/auto/sources +++ b/auto/sources @@ -130,13 +130,6 @@ RTSIG_SRCS=src/event/modules/ngx_rtsig_module.c IOCP_MODULE=ngx_iocp_module IOCP_SRCS=src/event/modules/ngx_iocp_module.c -AIO_MODULE=ngx_aio_module -AIO_SRCS="src/event/modules/ngx_aio_module.c \ - src/os/unix/ngx_aio_read.c \ - src/os/unix/ngx_aio_write.c \ - src/os/unix/ngx_aio_read_chain.c \ - src/os/unix/ngx_aio_write_chain.c" - FILE_AIO_SRCS="src/os/unix/ngx_file_aio_read.c" LINUX_AIO_SRCS="src/os/unix/ngx_linux_aio_read.c" |