diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-03-10 14:35:21 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-03-10 14:35:21 +0000 |
| commit | 001a9cfa37b47f323c4c9197b58b5d92a1dabfe9 (patch) | |
| tree | c9dd11dbf7e74dffcf524d9828be2133f335bcdb | |
| parent | d48d0d9f422baf87d349814c58dc31761838f908 (diff) | |
| download | nginx-001a9cfa37b47f323c4c9197b58b5d92a1dabfe9.tar.gz nginx-001a9cfa37b47f323c4c9197b58b5d92a1dabfe9.zip | |
disable rtsig automatic building in post 2.6.18 Linux kernels
| -rw-r--r-- | auto/os/linux | 5 | ||||
| -rw-r--r-- | src/os/unix/ngx_linux_init.c | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/auto/os/linux b/auto/os/linux index 786b560ea..6dd51a429 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -22,9 +22,10 @@ version=`grep "#define LINUX_VERSION_CODE" /usr/include/linux/version.h \ version=${version:-0} -# enable the rt signals on Linux 2.2.19 and onward +# enable the rt signals on Linux between 2.2.19 and 2.6.17 -if [ $version -ge 131609 -o $EVENT_RTSIG = YES ]; then +if [ \( $version -ge 131609 -a $version -lt 132632 \) -o $EVENT_RTSIG = YES ] +then echo " + rt signals found" have=NGX_HAVE_RTSIG . auto/have EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE" diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c index cb83cd3e8..277be9537 100644 --- a/src/os/unix/ngx_linux_init.c +++ b/src/os/unix/ngx_linux_init.c @@ -11,7 +11,7 @@ u_char ngx_linux_kern_ostype[50]; u_char ngx_linux_kern_osrelease[50]; -int ngx_linux_rtsig_max; +int ngx_linux_rtsig_max; static ngx_os_io_t ngx_linux_io = { @@ -32,9 +32,6 @@ static ngx_os_io_t ngx_linux_io = { ngx_int_t ngx_os_specific_init(ngx_log_t *log) { - int name[2]; - size_t len; - ngx_err_t err; struct utsname u; if (uname(&u) == -1) { @@ -48,6 +45,12 @@ ngx_os_specific_init(ngx_log_t *log) (void) ngx_cpystrn(ngx_linux_kern_osrelease, (u_char *) u.release, sizeof(ngx_linux_kern_osrelease)); +#if (NGX_HAVE_RTSIG) + { + int name[2]; + size_t len; + ngx_err_t err; + name[0] = CTL_KERN; name[1] = KERN_RTSIGMAX; len = sizeof(ngx_linux_rtsig_max); @@ -65,6 +68,8 @@ ngx_os_specific_init(ngx_log_t *log) ngx_linux_rtsig_max = 0; } + } +#endif ngx_os_io = ngx_linux_io; @@ -78,6 +83,8 @@ ngx_os_specific_status(ngx_log_t *log) ngx_log_error(NGX_LOG_NOTICE, log, 0, "OS: %s %s", ngx_linux_kern_ostype, ngx_linux_kern_osrelease); +#if (NGX_HAVE_RTSIG) ngx_log_error(NGX_LOG_NOTICE, log, 0, "sysctl(KERN_RTSIGMAX): %d", ngx_linux_rtsig_max); +#endif } |