Mercurial > hg > nginx
changeset 4459:ccb2f8e3d08d
Added ngx_ncpu detection for most *nix platforms.
This inaccurate detection by using sysconf(_SC_NPROCESSORS_ONLN) can improve
usage of the mutex lock optimization on multicore systems.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Fri, 10 Feb 2012 11:24:19 +0000 |
parents | 2d4ff8bd5649 |
children | 6299d1c4dbb4 |
files | auto/unix src/os/unix/ngx_posix_init.c |
diffstat | 2 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/unix Fri Feb 10 10:48:58 2012 +0000 +++ b/auto/unix Fri Feb 10 11:24:19 2012 +0000 @@ -721,3 +721,13 @@ ngx_feature_libs= ngx_feature_test="struct dirent dir; dir.d_type = DT_REG" . auto/feature + + +ngx_feature="sysconf(_SC_NPROCESSORS_ONLN)" +ngx_feature_name="NGX_HAVE_SC_NPROCESSORS_ONLN" +ngx_feature_run=no +ngx_feature_incs= +ngx_feature_path= +ngx_feature_libs= +ngx_feature_test="sysconf(_SC_NPROCESSORS_ONLN)" +. auto/feature
--- a/src/os/unix/ngx_posix_init.c Fri Feb 10 10:48:58 2012 +0000 +++ b/src/os/unix/ngx_posix_init.c Fri Feb 10 11:24:19 2012 +0000 @@ -47,7 +47,13 @@ for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ } +#if (NGX_HAVE_SC_NPROCESSORS_ONLN) if (ngx_ncpu == 0) { + ngx_ncpu = sysconf(_SC_NPROCESSORS_ONLN); + } +#endif + + if (ngx_ncpu < 1) { ngx_ncpu = 1; }