com php-src: Make pid & uid available while handling realtime signals: ext/pcntl/pcntl.c ext/pcntl/tests/pcntl_realtime_signal.p hpt

From: Date: Tue, 12 Feb 2019 09:09:33 +0000
Subject: com php-src: Make pid & uid available while handling realtime signals: ext/pcntl/pcntl.c ext/pcntl/tests/pcntl_realtime_signal.p hpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104581@lists.php.net to get a copy of this message
Commit: b5cb3ac8ecab71bfe1eb7d5b2d7a48970e11a5b4 Author: hsldymq <hsldymq@qq.com> Thu, 28 Jun 2018 02:25:11 +0800 Committer: Nikita Popov <nikita.ppv@gmail.com> Tue, 12 Feb 2019 10:09:33 +0100 Parents: a109fddba4e3fbb6e3a2e008c0fa20a57f26103d Branches: PHP-7.2 PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b5cb3ac8ecab71bfe1eb7d5b2d7a48970e11a5b4 Log: Make pid & uid available while handling realtime signals Changed paths: M ext/pcntl/pcntl.c A ext/pcntl/tests/pcntl_realtime_signal.phpt Diff: diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 228111d..36d2a67 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -1276,6 +1276,12 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi break; #endif } +#if defined(SIGRTMIN) && defined(SIGRTMAX) + if (SIGRTMIN <= signo && signo <= SIGRTMAX) { + add_assoc_long_ex(user_siginfo, "pid", sizeof("pid")-1, siginfo->si_pid); + add_assoc_long_ex(user_siginfo, "uid", sizeof("uid")-1, siginfo->si_uid); + } +#endif } } /* }}} */ diff --git a/ext/pcntl/tests/pcntl_realtime_signal.phpt b/ext/pcntl/tests/pcntl_realtime_signal.phpt new file mode 100644 index 0000000..212f15e --- /dev/null +++ b/ext/pcntl/tests/pcntl_realtime_signal.phpt @@ -0,0 +1,20 @@ +--TEST-- +pcntl_signal() context of realtime signal +--SKIPIF-- +<?php if (!defined('SIGRTMIN')) die("skip realtime signal not supported"); ?> +<?php if (!extension_loaded("pcntl")) print "skip"; ?> +<?php if (!extension_loaded("posix")) die("skip posix extension not available"); ?> +--FILE-- +<?php + +pcntl_signal(SIGRTMIN, function ($signo, $siginfo) { + printf("got realtime signal from %s, ruid:%s\n", $siginfo['pid'] ?? '', $siginfo['uid'] ?? ''); +}); +posix_kill(posix_getpid(), SIGRTMIN); +pcntl_signal_dispatch(); + +echo "ok\n"; +?> +--EXPECTF-- +%rgot realtime signal from \d+, ruid:\d+%r +ok

« previous php.cvs (#104581) next »