using _SC_NPROCESSORS_CONF instead in case of cpu put offline.

addressing other remarks.

Author: devnexen

ext/pcntl/config.m4

@@ -7,18 +7,7 @@ if test "$PHP_PCNTL" != "no"; then
   AC_CHECK_FUNCS([fork], [], [AC_MSG_ERROR([pcntl: fork() not supported by this platform])])
   AC_CHECK_FUNCS([waitpid], [], [AC_MSG_ERROR([pcntl: waitpid() not supported by this platform])])
   AC_CHECK_FUNCS([sigaction], [], [AC_MSG_ERROR([pcntl: sigaction() not supported by this platform])])
-  AC_CHECK_FUNCS([
-	getpriority
-	setpriority
-	wait3
-	wait4
-	sigwaitinfo
-	sigtimedwait
-	unshare
-	rfork 
-	forkx
-	pidfd_open
-	sched_setaffinity])
+  AC_CHECK_FUNCS([getpriority setpriority wait3 wait4 sigwaitinfo sigtimedwait unshare rfork forkx pidfd_open sched_setaffinity])
 
   AC_CHECK_TYPE([siginfo_t],[PCNTL_CFLAGS="-DHAVE_STRUCT_SIGINFO_T"],,[#include <signal.h>])
 

ext/pcntl/pcntl.c

@@ -1514,7 +1514,7 @@ PHP_FUNCTION(pcntl_getcpuaffinity)
 		RETURN_FALSE;
 	}
 
-	zend_ulong maxcpus = (zend_ulong)sysconf(_SC_NPROCESSORS_ONLN);
+	zend_ulong maxcpus = (zend_ulong)sysconf(_SC_NPROCESSORS_CONF);
 	array_init(return_value);
 
 	for (zend_ulong i = 0; i < maxcpus; i ++) {
@@ -1544,26 +1544,33 @@ PHP_FUNCTION(pcntl_setcpuaffinity)
 
 	// 0 == getpid in this context, we're just saving a syscall
 	pid = pid_is_null ? 0 : pid;
-	zend_ulong maxcpus = (zend_ulong)sysconf(_SC_NPROCESSORS_ONLN);
+	zend_ulong maxcpus = (zend_ulong)sysconf(_SC_NPROCESSORS_CONF);
 	CPU_ZERO(&mask);
 
 	ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(hmask), ncpu) {
 		ZVAL_DEREF(ncpu);
 		zend_long cpu;
 		if (Z_TYPE_P(ncpu) != IS_LONG) {
 			if (Z_TYPE_P(ncpu) == IS_STRING) {
-				cpu = zval_get_long(ncpu);
+				zend_ulong tmp;
+				if (!ZEND_HANDLE_NUMERIC(Z_STR_P(ncpu), tmp)) {
+					zend_argument_value_error(2, "cpu id invalid value (%s)", ZSTR_VAL(Z_STR_P(ncpu)));
+					RETURN_THROWS();
+				}
+
+				cpu = (zend_long)tmp;
 			} else {
 				zend_string *wcpu = zval_get_string_func(ncpu);
-				zend_value_error("cpu id invalid type (%s)", ZSTR_VAL(wcpu));
+				zend_argument_value_error(2, "cpu id invalid type (%s)", ZSTR_VAL(wcpu));
+				zend_string_release(wcpu);
 				RETURN_THROWS();
 			}
 		} else {
 			cpu = Z_LVAL_P(ncpu);
 		}
 
 		if (cpu < 0 || cpu >= maxcpus) {
-			zend_value_error("cpu id must be between 0 and " ZEND_ULONG_FMT " (" ZEND_LONG_FMT ")", maxcpus, cpu);
+			zend_argument_value_error(2, "cpu id must be between 0 and " ZEND_ULONG_FMT " (" ZEND_LONG_FMT ")", maxcpus, cpu);
 			RETURN_THROWS();
 		}
 

ext/pcntl/tests/pcntl_cpuaffinity.phpt

@@ -60,9 +60,10 @@ array(0) {
 }
 bool(true)
 pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) must not be empty
-cpu id must be between 0 and %d (%d)
-cpu id must be between 0 and %d (-1024)
+pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id invalid value (def)
+pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (%d)
+pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (-1024)
 pcntl_getcpuaffinity(): Argument #1 ($process_id) invalid process (-1024)
 
 Warning: Array to string conversion in %s on line %d
-cpu id invalid type (Array)
+pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id invalid type (Array)