IO hooks PoC

.github/actions/apt-x64/action.yml

@@ -36,6 +36,8 @@ runs:
           language-pack-de \
           libgmp-dev \
           libicu-dev \
+          liburing-dev \
+          cmake \
           libtidy-dev \
           libenchant-2-dev \
           libbz2-dev \

.github/actions/build-ior-windows/action.yml

@@ -0,0 +1,64 @@
+name: Build ior (Windows)
+# Temporary, for the IO hooks proof of concept only, like build-ior: builds a
+# pinned commit of ior into a cached prefix laid out as win32/build/config.w32
+# expects (include\ior\ior.h, lib\ior.lib) and exports it as IOR_PREFIX, which
+# build_task.bat passes as --with-ior. The CI builds of PHP are release builds
+# (/MD), so ior is built Release against the same DLL runtime.
+inputs:
+  ref:
+    description: The ior commit to build, a full SHA
+    default: 2fb12e8ce012b8753258034de008266152742c13
+    required: false
+  arch:
+    description: x64 or x86
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: ior cache key
+      id: key
+      shell: pwsh
+      env:
+        IOR_REF: ${{ inputs.ref }}
+        IOR_ARCH: ${{ inputs.arch }}
+      run: |
+        "key=ior-$env:RUNNER_OS-$env:ImageOS-$env:PHP_BUILD_CRT-$env:IOR_ARCH-$env:IOR_REF" >> $env:GITHUB_OUTPUT
+    - name: Restore ior
+      id: cache
+      uses: actions/cache@v5
+      with:
+        path: C:\ior
+        key: ${{ steps.key.outputs.key }}
+    - name: Build ior
+      if: steps.cache.outputs.cache-hit != 'true'
+      shell: pwsh
+      env:
+        IOR_REF: ${{ inputs.ref }}
+        IOR_ARCH: ${{ inputs.arch }}
+      run: |
+        $ErrorActionPreference = 'Stop'
+        $PSNativeCommandUseErrorActionPreference = $true
+        Set-PSDebug -Trace 1
+        $prefix = 'C:\ior'
+        $src = Join-Path $env:RUNNER_TEMP 'ior-src'
+        foreach ($dir in @($src, $prefix)) {
+          if (Test-Path $dir) { Remove-Item -Recurse -Force $dir }
+        }
+        git init -q $src
+        git -C $src fetch --depth 1 https://github.com/libior/ior.git $env:IOR_REF
+        git -C $src checkout -q FETCH_HEAD
+        $platform = if ($env:IOR_ARCH -eq 'x86') { 'Win32' } else { 'x64' }
+        # Static library, IOCP backend; tests and bench would need cmocka
+        cmake -S $src -B "$src\build" -A $platform `
+          -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL `
+          -DIOR_BUILD_TESTS=OFF `
+          -DIOR_BUILD_BENCH=OFF
+        cmake --build "$src\build" --config Release --parallel
+        cmake --install "$src\build" --config Release --prefix $prefix
+    - name: Export the ior prefix
+      shell: pwsh
+      run: |
+        if (-not (Test-Path 'C:\ior\include\ior\ior.h') -or -not (Test-Path 'C:\ior\lib\ior.lib')) {
+          throw 'ior install prefix is incomplete'
+        }
+        "IOR_PREFIX=C:\ior" >> $env:GITHUB_ENV

.github/actions/build-ior/action.yml

@@ -0,0 +1,54 @@
+name: Build ior
+# Temporary, for the IO hooks proof of concept only: the ring (main/io/php_io_ring.c)
+# is built on the ior library, which will be bundled with php-src once the
+# design settles. Until then CI builds a pinned commit of it into a cached
+# prefix that ./configure finds through pkg-config (--with-ior).
+inputs:
+  ref:
+    description: The ior commit to build, a full SHA
+    default: 2fb12e8ce012b8753258034de008266152742c13
+    required: false
+runs:
+  using: composite
+  steps:
+    - name: ior cache key
+      id: key
+      shell: bash
+      env:
+        IOR_REF: ${{ inputs.ref }}
+      run: |
+        echo "key=ior-${RUNNER_OS}-${RUNNER_ARCH}-${ImageOS:-unknown}-${IOR_REF}" >> "$GITHUB_OUTPUT"
+    - name: Restore ior
+      id: cache
+      uses: actions/cache@v5
+      with:
+        path: ~/ior
+        key: ${{ steps.key.outputs.key }}
+    - name: Build ior
+      if: steps.cache.outputs.cache-hit != 'true'
+      shell: bash
+      env:
+        IOR_REF: ${{ inputs.ref }}
+      run: |
+        set -x
+        IOR_PREFIX="$HOME/ior"
+        IOR_SRC="$RUNNER_TEMP/ior-src"
+        rm -rf "$IOR_SRC" "$IOR_PREFIX"
+        git init -q "$IOR_SRC"
+        git -C "$IOR_SRC" fetch --depth 1 https://github.com/libior/ior.git "$IOR_REF"
+        git -C "$IOR_SRC" checkout -q FETCH_HEAD
+        # Both Linux backends in one library, so IOR_BACKEND=threads can
+        # select the thread pool at run time; a no-op elsewhere
+        cmake -S "$IOR_SRC" -B "$IOR_SRC/build" \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX="$IOR_PREFIX" \
+          -DIOR_WITH_THREADS=ON \
+          -DIOR_BUILD_TESTS=OFF \
+          -DIOR_BUILD_BENCH=OFF
+        cmake --build "$IOR_SRC/build" --parallel
+        cmake --install "$IOR_SRC/build"
+    - name: Point pkg-config at ior
+      shell: bash
+      run: |
+        IOR_PREFIX="$HOME/ior"
+        echo "PKG_CONFIG_PATH=$IOR_PREFIX/lib/pkgconfig:$IOR_PREFIX/lib64/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" >> "$GITHUB_ENV"

.github/actions/configure-macos/action.yml

@@ -6,6 +6,9 @@ inputs:
 runs:
   using: composite
   steps:
+    # Temporary for the IO hooks proof of concept, see the action
+    - name: Build ior
+      uses: ./.github/actions/build-ior
     - shell: bash
       run: |
         set -x
@@ -53,6 +56,7 @@ runs:
           --enable-sockets \
           --with-bz2="$BREW_OPT"/bzip2 \
           --with-openssl \
+          --with-ior \
           --with-gmp="$BREW_OPT"/gmp \
           --with-iconv="$BREW_OPT"/libiconv \
           --enable-bcmath \

.github/actions/configure-x64/action.yml

@@ -12,6 +12,9 @@ inputs:
 runs:
   using: composite
   steps:
+    # Temporary for the IO hooks proof of concept, see the action
+    - name: Build ior
+      uses: ./.github/actions/build-ior
     - shell: bash
       run: |
         set -x
@@ -78,6 +81,7 @@ runs:
           ${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
           --with-config-file-path=/etc \
           --with-config-file-scan-dir=/etc/php.d \
+          --with-ior \
           ${{ inputs.skipSlow == 'false' && '--with-pdo-firebird' || '' }} \
           ${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
           --enable-werror \

.github/matrix.php

@@ -141,7 +141,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
         $jobs['SOLARIS'] = true;
     }
     if ($all_jobs || !$no_jobs || $test_windows) {
-        $matrix = [['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true]];
+        $matrix = [['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true, 'ior' => true]];
         if ($all_variations) {
             $matrix[] = ['asan' => true, 'opcache' => true, 'x64' => true, 'zts' => true];
             $matrix[] = ['asan' => false, 'opcache' => false, 'x64' => false, 'zts' => false];

.github/scripts/windows/build_task.bat

@@ -27,6 +27,7 @@ if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
 if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
 if "%ASAN%" equ "1" set ADD_CONF=%ADD_CONF% --enable-sanitizer --enable-debug-pack
 if "%CLANG_TOOLSET%" equ "1" set ADD_CONF=%ADD_CONF% --with-toolset=clang
+if "%IOR_PREFIX%" neq "" set ADD_CONF=%ADD_CONF% --with-ior=%IOR_PREFIX%
 
 rem C4018: comparison: signed/unsigned mismatch
 rem C4146: unary minus operator applied to unsigned type

.github/scripts/windows/test_task.bat

@@ -154,6 +154,18 @@ nmake test TESTS="%OPCACHE_OPTS% -g FAIL,BORK,LEAK,XLEAK %ASAN_OPTS% --no-progre
 
 set EXIT_CODE=%errorlevel%
 
+rem The IO hooks tests again, on the ring built on ior
+if "%IOR_PREFIX%" neq "" (
+	set IO_HOOKS_QUEUE=ring
+	nmake test TESTS="-g FAIL,BORK,LEAK,XLEAK --no-progress -q --offline --show-diff --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp %PARALLEL% ext\standard\tests\streams\hooks ext\standard\tests\poll ext\openssl\tests\stream_io_hooks.phpt ext\curl\tests"
+	if errorlevel 1 set EXIT_CODE=3
+	set IO_HOOKS_CAPS=files,directData,directAccept
+	nmake test TESTS="-g FAIL,BORK,LEAK,XLEAK --no-progress -q --offline --show-diff --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp %PARALLEL% ext\standard\tests\streams\hooks ext\openssl\tests\stream_io_hooks.phpt ext\curl\tests"
+	if errorlevel 1 set EXIT_CODE=3
+	set IO_HOOKS_CAPS=
+	set IO_HOOKS_QUEUE=
+)
+
 nmake unregister_comtest
 taskkill /f /im snmpd.exe
 

.github/workflows/test-suite.yml

@@ -871,6 +871,11 @@ jobs:
           ref: ${{ fromJson(inputs.branch).ref }}
       - name: Setup
         uses: ./.github/actions/setup-windows
+      - name: Build ior
+        if: ${{ matrix.ior }}
+        uses: ./.github/actions/build-ior-windows
+        with:
+          arch: ${{ matrix.x64 && 'x64' || 'x86' }}
       - name: Build
         run: .github/scripts/windows/build.bat
       - name: Test

Zend/zend_hrtime.h

@@ -72,6 +72,7 @@ ZEND_API extern mach_timebase_info_data_t zend_hrtime_timerlib_info;
 
 #endif
 
+#define ZEND_HRTIME_T_MAX UINT64_MAX
 #define ZEND_NANO_IN_SEC UINT64_C(1000000000)
 
 typedef uint64_t zend_hrtime_t;

configure.ac

@@ -586,6 +586,7 @@ AC_CHECK_FUNCS([
   setitimer
   shutdown
   sigprocmask
+  sigtimedwait
   splice
   statfs
   statvfs
@@ -620,6 +621,8 @@ AC_FUNC_STRERROR_R
 
 dnl Check for functions inside their belonging headers.
 AC_CHECK_HEADER([sys/prctl.h], [AC_CHECK_FUNCS([prctl])])
+AC_CHECK_HEADERS([sys/signalfd.h sys/pidfd.h])
+AC_CHECK_FUNCS([pidfd_open signalfd pipe2])
 AC_CHECK_HEADER([sys/procctl.h], [AC_CHECK_FUNCS([procctl])])
 
 AX_FUNC_WHICH_GETHOSTBYNAME_R
@@ -751,6 +754,30 @@ AS_VAR_IF([php_cv_have__asm_goto], [yes],
   [AC_DEFINE([HAVE_ASM_GOTO], [1],
     [Define to 1 if asm goto support is available.])])
 
+dnl Check for the ior library the IO ring is built on.
+PHP_ARG_WITH([ior],
+  [for ior support],
+  [AS_HELP_STRING([[--with-ior[=DIR]]],
+    [Build the IO ring on the ior library, found through pkg-config. The
+    optional DIR is the ior install prefix to take its pkg-config file from])],
+  [no],
+  [no])
+AS_VAR_IF([PHP_IOR], [no],, [
+  php_ior_pkg_config_path=$PKG_CONFIG_PATH
+  AS_VAR_IF([PHP_IOR], [yes],, [
+    PKG_CONFIG_PATH="$PHP_IOR/lib/pkgconfig:$PHP_IOR/lib64/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+    export PKG_CONFIG_PATH
+  ])
+  PKG_CHECK_MODULES([IOR], [ior])
+  IOR_LIBS=$($PKG_CONFIG --static --libs ior)
+  PKG_CONFIG_PATH=$php_ior_pkg_config_path
+  PHP_EVAL_INCLINE([$IOR_CFLAGS])
+  PHP_EVAL_LIBLINE([$IOR_LIBS])
+  AC_DEFINE([HAVE_IOR], [1], [Define to 1 if the ior library is available.])
+  PHP_ADD_SOURCES([main/io], [php_io_ring.c],
+    [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
+])
+
 dnl Check Valgrind support.
 PHP_ARG_WITH([valgrind],
   [whether to enable Valgrind support],
@@ -1694,6 +1721,8 @@ PHP_ADD_SOURCES([main/io], m4_normalize([
     php_io_copy_freebsd.c
     php_io_copy_solaris.c
     php_io_copy_macos.c
+    php_io_hooks.c
+    php_io_queue_poll.c
   ]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 
@@ -1705,6 +1734,7 @@ PHP_ADD_SOURCES([main/poll], m4_normalize([
     poll_core.c
     poll_fd_table.c
     poll_handle.c
+    poll_source.c
   ]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 

ext/curl/curl_private.h

@@ -26,6 +26,8 @@
 #include <curl/curl.h>
 #include <curl/multi.h>
 
+#include "main/php_deadline.h"
+
 #define CURLOPT_RETURNTRANSFER 19913
 #define CURLOPT_BINARYTRANSFER 19914 /* For Backward compatibility */
 #define PHP_CURL_STDOUT 0
@@ -109,12 +111,20 @@ typedef struct {
 	struct _php_curl_send_headers header;
 	struct _php_curl_error        err;
 	bool                     in_callback;
+	bool                     in_exec;
 	uint32_t*                     clone;
 	zval                          postfields;
 	/* For CURLOPT_PRIVATE */
 	zval private_data;
 	/* CurlShareHandle object set using CURLOPT_SHARE. */
 	struct _php_curlsh *share;
+	/* Sockets libcurl wants watched, keyed by curl_socket_t */
+	HashTable *io_sockets;
+	struct _php_curl_socket_entry *io_removed;
+	php_deadline io_timer;
+	/* Private multi handle driving curl_exec() */
+	CURLM *multi;
+	long maxconnects;
 	zend_object                   std;
 } php_curl;
 
@@ -148,6 +158,7 @@ void _php_curl_cleanup_handle(php_curl *);
 void _php_curl_multi_cleanup_list(void *data);
 void _php_curl_verify_handlers(php_curl *ch, bool reporterror);
 void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source);
+bool php_curl_check_not_in_exec(php_curl *ch);
 
 /* Consumes `zv` */
 zend_long php_curl_get_long(zval *zv);

ext/curl/curl_socket_handle.stub.php

@@ -0,0 +1,18 @@
+<?php
+
+/** @generate-class-entries */
+
+/**
+ * Identity of one socket in a multi handle's connection pool, from the first
+ * report to CURL_POLL_REMOVE; a pooled connection reused later gets a new one.
+ * Created by the extension's socket callback only, so userland sees it
+ * through operations and registrations.
+ * @strict-properties
+ * @not-serializable
+ */
+final class CurlSocketPollWeakHandle implements Io\Poll\WeakHandle
+{
+    private function __construct() {}
+
+    public function isValid(): bool {}
+}