poll: remove incorrect edge triggering simulation

ext/standard/tests/streams/stream_poll.inc

@@ -1,5 +1,19 @@
 <?php
 // stream Poll Testing helper
+
+function pt_new_stream_poll(): StreamPollContext {
+    $backend = getenv('STREAM_POLL_TEST_BACKEND');
+    return stream_poll_create($backend === false ? STREAM_POLL_BACKEND_AUTO : $backend);
+}
+
+function pt_skip_for_backend($backend, $msg): void {
+    $backends_to_skip = is_array($backend) ? $backend : array($backend);
+    $current_backend = stream_poll_backend_name(pt_new_stream_poll());
+    if (in_array($current_backend, $backends_to_skip)) {
+        die("skip backend $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);
@@ -65,11 +79,6 @@ function pt_new_tcp_socket_connections(int $num_conns): array {
     return [$clients, $server_conns];
 }
 
-function pt_new_stream_poll(): StreamPollContext {
-    $backend = getenv('STREAM_POLL_TEST_BACKEND');
-    return stream_poll_create($backend === false ? STREAM_POLL_BACKEND_AUTO : $backend);
-}
-
 function pt_write_sleep($stream, $data, $delay = 10000): int|false {
     $result = fwrite($stream, $data, $delay);
     usleep($delay);

ext/standard/tests/streams/stream_poll_basic_sock_rw_multi_edge.phpt

@@ -1,5 +1,10 @@
 --TEST--
 Stream polling - socket write / read multiple times with edge triggering
+--SKIPIF--
+<?php
+require_once __DIR__ . '/stream_poll.inc';
+pt_skip_for_backend(['poll', 'select'], 'does not support edger triggering')
+?>
 --FILE--
 <?php
 require_once __DIR__ . '/stream_poll.inc';

ext/standard/tests/streams/stream_poll_basic_sock_rw_single_edge.phpt

@@ -21,4 +21,4 @@ pt_expect_events(stream_poll_wait($poll_ctx, 100), [
 ?>
 --EXPECT--
 Events matched - count: 1
-Events matched - count: 2
+Events matched - count: 1

main/poll/php_poll_internal.h

@@ -119,9 +119,6 @@ php_socket_t php_poll_fd_table_get_max_fd(php_poll_fd_table *table);
 int php_poll_fd_table_collect_events(
 		php_poll_fd_table *table, php_poll_event *events, int max_events);
 
-/* Edge triggering simulation helper */
-int php_poll_simulate_edge_trigger(php_poll_fd_table *table, php_poll_event *events, int nfds);
-
 /* Error helper functions */
 php_poll_error php_poll_errno_to_error(int err);
 

main/poll/poll_backend_poll.c

@@ -109,6 +109,11 @@ static zend_result poll_backend_add(php_poll_ctx *ctx, int fd, uint32_t events,
 {
 	poll_backend_data_t *backend_data = (poll_backend_data_t *) ctx->backend_data;
 
+	if (events & PHP_POLL_ET) {
+		php_poll_set_error(ctx, PHP_POLL_ERR_NOSUPPORT);
+		return FAILURE;
+	}
+
 	if (php_poll_fd_table_find(backend_data->fd_table, fd)) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_EXISTS);
 		return FAILURE;
@@ -130,6 +135,11 @@ static zend_result poll_backend_modify(php_poll_ctx *ctx, int fd, uint32_t event
 {
 	poll_backend_data_t *backend_data = (poll_backend_data_t *) ctx->backend_data;
 
+	if (events & PHP_POLL_ET) {
+		php_poll_set_error(ctx, PHP_POLL_ERR_NOSUPPORT);
+		return FAILURE;
+	}
+
 	php_poll_fd_entry *entry = php_poll_fd_table_find(backend_data->fd_table, fd);
 	if (!entry) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_NOTFOUND);
@@ -256,9 +266,6 @@ static int poll_backend_wait(php_poll_ctx *ctx, php_poll_event *events, int max_
 				backend_data->fd_table, poll_process_results_callback, &result_ctx);
 		int event_count = result_ctx.event_count;
 
-		/* Apply edge-trigger simulation */
-		nfds = php_poll_simulate_edge_trigger(backend_data->fd_table, events, event_count);
-
 		/* Handle oneshot removals */
 		for (int i = 0; i < nfds; i++) {
 			php_poll_fd_entry *entry = php_poll_fd_table_find(backend_data->fd_table, events[i].fd);

main/poll/poll_backend_select.c

@@ -94,6 +94,11 @@ static zend_result select_backend_add(php_poll_ctx *ctx, int fd, uint32_t events
 	select_backend_data_t *backend_data = (select_backend_data_t *) ctx->backend_data;
 	php_socket_t sock = (php_socket_t) fd;
 
+	if (events & PHP_POLL_ET) {
+		php_poll_set_error(ctx, PHP_POLL_ERR_NOSUPPORT);
+		return FAILURE;
+	}
+
 #ifdef FD_SETSIZE
 	if (sock >= FD_SETSIZE) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_INVALID);
@@ -139,6 +144,11 @@ static zend_result select_backend_modify(
 	select_backend_data_t *backend_data = (select_backend_data_t *) ctx->backend_data;
 	php_socket_t sock = (php_socket_t) fd;
 
+	if (events & PHP_POLL_ET) {
+		php_poll_set_error(ctx, PHP_POLL_ERR_NOSUPPORT);
+		return FAILURE;
+	}
+
 	php_poll_fd_entry *entry = php_poll_fd_table_find(backend_data->fd_table, fd);
 	if (!entry) {
 		php_poll_set_error(ctx, PHP_POLL_ERR_NOTFOUND);
@@ -293,18 +303,15 @@ static int select_backend_wait(
 	php_poll_fd_table_foreach(backend_data->fd_table, process_select_result_callback, &result_ctx);
 	int event_count = result_ctx.event_count;
 
-	/* Apply edge-trigger simulation */
-	int nfds = php_poll_simulate_edge_trigger(backend_data->fd_table, events, event_count);
-
 	/* Handle oneshot removals */
-	for (int i = 0; i < nfds; i++) {
+	for (int i = 0; i < event_count; i++) {
 		php_poll_fd_entry *entry = php_poll_fd_table_find(backend_data->fd_table, events[i].fd);
 		if (entry && (entry->events & PHP_POLL_ONESHOT) && events[i].revents != 0) {
 			select_handle_oneshot_removal(backend_data, events[i].fd);
 		}
 	}
 
-	return nfds;
+	return event_count;
 }
 
 static bool select_backend_is_available(void)

main/poll/poll_core.c

@@ -406,47 +406,3 @@ PHPAPI const char *php_poll_error_string(php_poll_error error)
 			return "Unknown error";
 	}
 }
-
-/* Edge-trigger simulation helper */
-int php_poll_simulate_edge_trigger(php_poll_fd_table *table, php_poll_event *events, int nfds)
-{
-	int filtered_count = 0;
-
-	for (int i = 0; i < nfds; i++) {
-		php_poll_fd_entry *entry = php_poll_fd_table_find(table, events[i].fd);
-		if (!entry) {
-			continue;
-		}
-
-		uint32_t new_events = events[i].revents;
-		uint32_t reported_events = 0;
-
-		if (entry->events & PHP_POLL_ET) {
-			/* Edge-triggered: report edges only */
-			if ((new_events & PHP_POLL_READ) && !(entry->last_revents & PHP_POLL_READ)) {
-				reported_events |= PHP_POLL_READ;
-			}
-			if ((new_events & PHP_POLL_WRITE) && !(entry->last_revents & PHP_POLL_WRITE)) {
-				reported_events |= PHP_POLL_WRITE;
-			}
-			/* Always report error and hangup events */
-			reported_events |= (new_events & (PHP_POLL_ERROR | PHP_POLL_HUP | PHP_POLL_RDHUP));
-		} else {
-			/* Level-triggered: report all active events */
-			reported_events = new_events;
-		}
-
-		entry->last_revents = new_events;
-
-		/* Only include this event if we have something to report */
-		if (reported_events != 0) {
-			if (filtered_count != i) {
-				events[filtered_count] = events[i];
-			}
-			events[filtered_count].revents = reported_events;
-			filtered_count++;
-		}
-	}
-
-	return filtered_count;
-}