[nginx] svn commit: r4460 - in trunk: auto src/os/unix

[vbart at nginx.com]

Author: vbart
Date: 2012-02-10 11:24:19 +0000 (Fri, 10 Feb 2012)
New Revision: 4460

Modified:
   trunk/auto/unix
   trunk/src/os/unix/ngx_posix_init.c
Log:
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.


Modified: trunk/auto/unix
===================================================================
--- trunk/auto/unix	2012-02-10 10:48:58 UTC (rev 4459)
+++ trunk/auto/unix	2012-02-10 11:24:19 UTC (rev 4460)
@@ -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

Modified: trunk/src/os/unix/ngx_posix_init.c
===================================================================
--- trunk/src/os/unix/ngx_posix_init.c	2012-02-10 10:48:58 UTC (rev 4459)
+++ trunk/src/os/unix/ngx_posix_init.c	2012-02-10 11:24:19 UTC (rev 4460)
@@ -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;
     }