Ticket #1151: nginx-cgroup-cpu-count.patch

src/os/unix/ngx_posix_init.c

@@ -36 +36 @@
 {
     ngx_time_t  *tp;
     ngx_uint_t   n;
+    cpu_set_t set;
 
 #if (NGX_HAVE_OS_SPECIFIC_INIT)
     if (ngx_os_specific_init(log) != NGX_OK) {
@@ -51 +52 @@
     ngx_cacheline_size = NGX_CPU_CACHE_LINE;
 
     for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ }
-
 #if (NGX_HAVE_SC_NPROCESSORS_ONLN)
     if (ngx_ncpu == 0) {
+#ifdef CPU_COUNT
+        if (sched_getaffinity (0, sizeof (set), &set) == 0)
+        {
+            ngx_ncpu = CPU_COUNT (&set);
+        }
+#else
         ngx_ncpu = sysconf(_SC_NPROCESSORS_ONLN);
+#endif
     }
 #endif