Addressing few remarks

Author: devnexen

sapi/fpm/fpm/fpm_unix.c

@@ -451,7 +451,7 @@ static int fpm_cpuaffinity_set(struct fpm_cpuaffinity_conf *c)
 
 static void fpm_cpuaffinity_destroy(struct fpm_cpuaffinity_conf *c)
 {
-	// some platform/apis requires to allocates data on the heap
+	// some platform/apis require to allocates data on the heap
 }
 
 static int fpm_setcpuaffinity(char *cpumask)
@@ -470,8 +470,8 @@ static int fpm_setcpuaffinity(char *cpumask)
 		char *cpumasksep;
 
 		fconf.min = strtol(token, &cpumasksep, 0);
-		if (errno || fconf.min > cpumax) {
-			goto fail;
+		if (errno || fconf.min < 0 || fconf.min > cpumax) {
+			return -1;
 		}
 		fconf.max = fconf.min;
 		if (*cpumasksep == '-') {
@@ -491,7 +491,6 @@ static int fpm_setcpuaffinity(char *cpumask)
 		token = php_strtok_r(NULL, ";", &buf);
 	}
 
-fail:
 	r = fpm_cpuaffinity_set(&fconf);
 	fpm_cpuaffinity_destroy(&fconf);
 	return r;

sapi/fpm/php-fpm.conf.in

@@ -126,7 +126,7 @@
 ;systemd_interval = 10
 
 ; Bind the master process to a cpu set.
-; The value can be one cpu id or a range.
+; The value can be one cpu id, a range or a list thereof.
 ;
 ; Default Value: not set
 ; process.cpumask = "4"

sapi/fpm/tests/cpuaffinity-fail.phpt

@@ -28,7 +28,7 @@ EOT;
 
 $tester = new FPM\Tester($cfg);
 $tester->start();
-$tester->expectLogError("failed to fpm_setcpuaffinity\(\d+\): Invalid argument \(\d+\)");
+$tester->expectLogError("failed to fpm_setcpuaffinity\(\d+\): Inappropriate ioctl for device \(\d+\)");
 $tester->expectLogError("FPM initialization failed");
 $tester->close();
 

sapi/fpm/tests/cpuaffinity.phpt

@@ -6,6 +6,10 @@ FPM: cpu affinity test
 if (!str_contains(PHP_OS, 'Linux')) {
     die('skipped supported only on Linux');
 }
+$nproc = intval(exec("nproc"));
+if ($nproc < 2) {
+    die('skipped supported only on multicores environments');
+}
 ?>
 --FILE--
 <?php

sapi/fpm/www.conf.in

@@ -81,7 +81,7 @@ listen = 127.0.0.1:9000
 ; process.priority = -19
 
 ; Bind the pool processes to a cpu set.
-; The value can be one cpu id or a range.
+; The value can be one cpu id, a range or a list thereof.
 ;
 ; Default Value: inherits master's cpu affinity
 ; process.cpumask = "8"