archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/pcntl: pcntl affinity improves EINVAL handling in both cases. (#13907)

Browse source 
also disable tests on travis.
This commit is contained in:
David CARLIER 2024-04-07 16:43:36 +01:00 • committed by GitHub
parent 814098248c
commit dd2ffaab2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pcntl/pcntl.c
View file

@ -1516,6 +1516,9 @@ PHP_FUNCTION(pcntl_getcpuaffinity)
case EPERM: case EPERM:
php_error_docref(NULL, E_WARNING, "Calling process not having the proper privileges"); php_error_docref(NULL, E_WARNING, "Calling process not having the proper privileges");
break; break;
case EINVAL:
zend_value_error("invalid cpu affinity mask size");
RETURN_THROWS();
default: default:
php_error_docref(NULL, E_WARNING, "Error %d", errno); php_error_docref(NULL, E_WARNING, "Error %d", errno);
} }
@ -1597,6 +1600,9 @@ PHP_FUNCTION(pcntl_setcpuaffinity)
case EPERM: case EPERM:
php_error_docref(NULL, E_WARNING, "Calling process not having the proper privileges"); php_error_docref(NULL, E_WARNING, "Calling process not having the proper privileges");
break; break;
case EINVAL:
zend_argument_value_error(2, "invalid cpu affinity mask size or unmapped cpu id(s)");
RETURN_THROWS();
default: default:
php_error_docref(NULL, E_WARNING, "Error %d", errno); php_error_docref(NULL, E_WARNING, "Error %d", errno);
} }

1
ext/pcntl/tests/pcntl_cpuaffinity.phpt
View file

@ -5,6 +5,7 @@ pcntl
--SKIPIF-- --SKIPIF--
<?php <?php
if (!function_exists("pcntl_setcpuaffinity")) die("skip pcntl_setcpuaffinity is not available"); if (!function_exists("pcntl_setcpuaffinity")) die("skip pcntl_setcpuaffinity is not available");
if (getenv('TRAVIS')) die('skip Currently fails on Travis');
?> ?>
--FILE-- --FILE--
<?php <?php