changes from feedback, removing "further plans" parts.

using _SC_NPROCESSORS_ONLN code path only as backup now,
checking actual max cpu affinity first.

Author: devnexen

configure.ac

@@ -403,10 +403,8 @@ pty.h \
 pwd.h \
 resolv.h \
 strings.h \
-sched.h \
 syslog.h \
 sysexits.h \
-sys/cpuset.h \
 sys/ioctl.h \
 sys/file.h \
 sys/mman.h \
@@ -572,7 +570,6 @@ AC_CHECK_FUNCS(
 alphasort \
 asctime_r \
 chroot \
-cpuset_setaffinity \
 ctime_r \
 explicit_memset \
 fdatasync \
@@ -610,7 +607,6 @@ poll \
 pthread_jit_write_protect_np \
 putenv \
 scandir \
-sched_setaffinity \
 setitimer \
 setenv \
 shutdown \

sapi/fpm/config.m4

@@ -7,7 +7,8 @@ PHP_ARG_ENABLE([fpm],,
 dnl Configure checks.
 AC_DEFUN([AC_FPM_STDLIBS],
 [
-  AC_CHECK_FUNCS(clearenv setproctitle setproctitle_fast)
+  AC_CHECK_FUNCS(clearenv setproctitle setproctitle_fast cpuset_setaffinity sched_setaffinity)
+  AC_CHECK_HEADERS([sys/cpuset.h sched.h])
 
   AC_SEARCH_LIBS(socket, socket)
   AC_SEARCH_LIBS(inet_addr, nsl)

sapi/fpm/fpm/fpm_conf.c

@@ -1742,6 +1742,9 @@ static void fpm_conf_dump(void)
 	} else {
 		zlog(ZLOG_NOTICE, "\tprocess.priority = %d", fpm_global_config.process_priority);
 	}
+#if HAVE_FPM_CPUAFFINITY
+	zlog(ZLOG_NOTICE, "\tprocess.cpumask = %s",             STR2STR(fpm_global_config.process_cpumask));
+#endif
 	zlog(ZLOG_NOTICE, "\tdaemonize = %s",                   BOOL2STR(fpm_global_config.daemonize));
 	zlog(ZLOG_NOTICE, "\trlimit_files = %d",                fpm_global_config.rlimit_files);
 	zlog(ZLOG_NOTICE, "\trlimit_core = %d",                 fpm_global_config.rlimit_core);
@@ -1781,6 +1784,9 @@ static void fpm_conf_dump(void)
 			zlog(ZLOG_NOTICE, "\tprocess.priority = %d", wp->config->process_priority);
 		}
 		zlog(ZLOG_NOTICE, "\tprocess.dumpable = %s",           BOOL2STR(wp->config->process_dumpable));
+#if HAVE_FPM_CPUAFFINITY
+		zlog(ZLOG_NOTICE, "\tprocess.cpumask = %s",            STR2STR(wp->config->process_cpumask));
+#endif
 		zlog(ZLOG_NOTICE, "\tpm = %s",                         PM2STR(wp->config->pm));
 		zlog(ZLOG_NOTICE, "\tpm.max_children = %d",            wp->config->pm_max_children);
 		zlog(ZLOG_NOTICE, "\tpm.start_servers = %d",           wp->config->pm_start_servers);

sapi/fpm/fpm/fpm_unix.c

@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <errno.h>
 #include <pwd.h>
 #include <grp.h>
 
@@ -414,22 +415,31 @@ static long fpm_cpumax(void)
 {
 	static long cpuid = LONG_MIN;
 	if (cpuid == LONG_MIN) {
-		cpuid = sysconf(_SC_NPROCESSORS_ONLN);
+		cpu_set_t cset;
+#if defined(HAVE_SCHED_SETAFFINITY)
+		if (sched_getaffinity(0, sizeof(cset), &cset) == 0) {
+#elif defined(HAVE_CPUSET_SETAFFINITY)
+		if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cset), &cset) == 0) {
+#endif
+			cpuid = CPU_COUNT(&cset);
+		} else {
+			cpuid = -1;
+		}
 	}
 
 	return cpuid;
 }
 
 static void fpm_cpuaffinity_init(struct fpm_cpuaffinity_conf *c)
 {
-#if defined(HAVE_SCHED_SETAFFINITY) || defined(HAVE_CPUSET_SETAFFINITY)
+#if defined(HAVE_FPM_CPUAFFINITY)
 	CPU_ZERO(&c->cset);
 #endif
 }
 
 static void fpm_cpuaffinity_add(struct fpm_cpuaffinity_conf *c)
 {
-#if defined(HAVE_SCHED_SETAFFINITY) || defined(HAVE_CPUSET_SETAFFINITY)
+#if defined(HAVE_FPM_CPUAFFINITY)
 	int i;
 
 	for (i = c->min; i <= c->max; i ++) {
@@ -449,11 +459,6 @@ static int fpm_cpuaffinity_set(struct fpm_cpuaffinity_conf *c)
 #endif
 }
 
-static void fpm_cpuaffinity_destroy(struct fpm_cpuaffinity_conf *c)
-{
-	// some platform/apis require to allocates data on the heap
-}
-
 static int fpm_setcpuaffinity(char *cpumask)
 {
 	char *token, *buf;
@@ -464,7 +469,7 @@ static int fpm_setcpuaffinity(char *cpumask)
 	cpumax = fpm_cpumax();
 
 	fpm_cpuaffinity_init(&fconf);
-	token = php_strtok_r(cpumask, ";", &buf);
+	token = php_strtok_r(cpumask, ",", &buf);
 
 	while (token) {
 		char *cpumasksep;
@@ -492,7 +497,6 @@ static int fpm_setcpuaffinity(char *cpumask)
 	}
 
 	r = fpm_cpuaffinity_set(&fconf);
-	fpm_cpuaffinity_destroy(&fconf);
 	return r;
 }
 #endif

sapi/fpm/php-fpm.conf.in

@@ -129,9 +129,12 @@
 ; The value can be one cpu id, a range or a list thereof.
 ;
 ; Default Value: not set
+; the master process could be bound to a single core
 ; process.cpumask = "4"
+; a range from the minimum cpuid to the max required
 ; process.cpumask = "0-3"
-; process.cpumask = "1-4;8-16;32-48"
+; or multiple ranges separated by a comma
+; process.cpumask = "1-4,8-16,32-48"
 
 ;;;;;;;;;;;;;;;;;;;;
 ; Pool Definitions ;

sapi/fpm/www.conf.in

@@ -84,9 +84,12 @@ listen = 127.0.0.1:9000
 ; The value can be one cpu id, a range or a list thereof.
 ;
 ; Default Value: inherits master's cpu affinity
+; the pool process could be bound to a single core
 ; process.cpumask = "8"
+; a range from the minimum cpuid to the max required
 ; process.cpumask = "0-3"
-; process.cpumask = "4-7;10-12"
+; or multiple ranges separated by a comma
+; process.cpumask = "4-7,10-12"
 
 ; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or
 ; PROC_TRACE_CTL procctl for FreeBSD) even if the process user