Merge tag '1.33.0' into packaging.

Unit 1.33.0 release.

1 files changed, 23 insertions, 4 deletions

diff --git a/src/nxt_lib.c b/src/nxt_lib.c
index aba07dda..de23ce0a 100644
--- a/src/nxt_lib.c
+++ b/src/nxt_lib.c
@@ -32,7 +32,7 @@ const char *malloc_conf = "junk:true";
 nxt_int_t
 nxt_lib_start(const char *app, char **argv, char ***envp)
 {
-    int           n;
+    int           n = 0;
     nxt_int_t     flags;
     nxt_bool_t    update;
     nxt_thread_t  *thread;
@@ -87,13 +87,32 @@ nxt_lib_start(const char *app, char **argv, char ***envp)
 #ifdef _SC_NPROCESSORS_ONLN
     /* Linux, FreeBSD, Solaris, MacOSX. */
     n = sysconf(_SC_NPROCESSORS_ONLN);
+#endif
+
+#if (NXT_HAVE_LINUX_SCHED_GETAFFINITY)
+    if (n > 0) {
+        int        err;
+        size_t     size;
+        cpu_set_t  *set;
+
+        set = CPU_ALLOC(n);
+        if (set == NULL) {
+            return NXT_ERROR;
+        }
+
+        size = CPU_ALLOC_SIZE(n);
+
+        err = sched_getaffinity(0, size, set);
+        if (err == 0) {
+            n = CPU_COUNT_S(size, set);
+        }
+
+        CPU_FREE(set);
+    }
 
 #elif (NXT_HPUX)
     n = mpctl(MPC_GETNUMSPUS, NULL, NULL);
 
-#else
-    n = 0;
-
 #endif
 
     nxt_debug(&nxt_main_task, "ncpu: %d", n);