poll: add test and fix kqueue raw events

Author: bukka

ext/standard/stream_poll.c

@@ -102,7 +102,7 @@ PHP_FUNCTION(stream_poll_create)
 	bool raw_events = false;
 	php_poll_ctx *poll_ctx;
 
-	ZEND_PARSE_PARAMETERS_START(0, 1)
+	ZEND_PARSE_PARAMETERS_START(0, 2)
 	Z_PARAM_OPTIONAL
 	Z_PARAM_STR_OR_LONG(backend_str, backend_long)
 	Z_PARAM_BOOL(raw_events)

ext/standard/tests/streams/stream_poll.inc

@@ -1,9 +1,9 @@
 <?php
 // stream Poll Testing helper
 
-function pt_new_stream_poll(): StreamPollContext {
+function pt_new_stream_poll($raw_event = false): StreamPollContext {
     $backend = getenv('STREAM_POLL_TEST_BACKEND');
-    return stream_poll_create($backend === false ? STREAM_POLL_BACKEND_AUTO : $backend);
+    return stream_poll_create($backend === false ? STREAM_POLL_BACKEND_AUTO : $backend, $raw_event);
 }
 
 function pt_skip_for_backend($backend, $msg): void {
@@ -14,6 +14,14 @@ function pt_skip_for_backend($backend, $msg): void {
     }
 }
 
+function pt_skip_for_all_backends_except($backend, $msg): void {
+    $backends_to_not_skip = is_array($backend) ? $backend : array($backend);
+    $current_backend = stream_poll_backend_name(pt_new_stream_poll());
+    if (!in_array($current_backend,$backends_to_not_skip)) {
+        die("skip backend other than $current_backend $msg\n");
+    }
+}
+
 function pt_new_socket_pair(): array {
     $domain = (strtoupper(substr(PHP_OS, 0, 3) == 'WIN') ? STREAM_PF_INET : STREAM_PF_UNIX);
     $sockets = stream_socket_pair($domain, STREAM_SOCK_STREAM, 0);

ext/standard/tests/streams/stream_poll_basic_tcp_rw_single_level_raw_kqueue.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Stream polling - TCP read write level combined for kqueue raw events
+--SKIPIF--
+<?php
+require_once __DIR__ . '/stream_poll.inc';
+pt_skip_for_all_backends_except('kqueue', 'are different for raw event')
+?>
+--FILE--
+<?php
+require_once __DIR__ . '/stream_poll.inc';
+
+list($client, $server) = pt_new_tcp_socket_pair();
+$poll_ctx = pt_new_stream_poll(true);
+
+stream_poll_add($poll_ctx, $client, STREAM_POLL_READ | STREAM_POLL_WRITE, "client_data");
+stream_poll_add($poll_ctx, $server, STREAM_POLL_READ | STREAM_POLL_WRITE, "server_data");
+
+pt_expect_events(stream_poll_wait($poll_ctx, 0), [
+    ['events' => STREAM_POLL_WRITE, 'data' => 'client_data'],
+    ['events' => STREAM_POLL_WRITE, 'data' => 'server_data']
+]);
+
+fwrite($client, "test data");
+usleep(10000);
+pt_expect_events(stream_poll_wait($poll_ctx, 100), [
+    ['events' => STREAM_POLL_WRITE, 'data' => 'client_data'],
+    ['events' => STREAM_POLL_WRITE, 'data' => 'server_data'],
+    ['events' => STREAM_POLL_READ, 'data' => 'server_data', 'read' => 'test data']
+]);
+
+?>
+--EXPECT--
+Events matched - count: 2
+Events matched - count: 3

main/poll/poll_core.c

@@ -107,7 +107,7 @@ static php_poll_ctx *php_poll_create_context(uint32_t flags)
 		return NULL;
 	}
 	ctx->persistent = persistent;
-	ctx->raw_events = flags & PHP_POLL_FLAG_RAW_EVENTS;
+	ctx->raw_events = (flags & PHP_POLL_FLAG_RAW_EVENTS) == PHP_POLL_FLAG_RAW_EVENTS;
 
 	return ctx;
 }