fix: add ext_php_rs_sapi_per_thread_shutdown

Author: Qard

.github/workflows/build.yml

@@ -225,24 +225,7 @@ jobs:
           echo "LLVM_CONFIG_PATH=${{ runner.temp }}/llvm-${{ env.clang }}/bin/llvm-config" >> $GITHUB_ENV
 
       - name: Test with embed feature
-        run: |
-          sudo apt-get update && sudo apt-get install -y gdb
-          sudo sysctl -w kernel.core_pattern='core.%e.%p'
-          ulimit -c unlimited
-          echo "Core pattern: $(cat /proc/sys/kernel/core_pattern)"
-          echo "Ulimit -c: $(ulimit -c)"
-          cargo test --workspace --release --features closure,embed,anyhow --no-fail-fast || \
-            (echo "Test failed, looking for core dumps..."; ls -la core.* 2>/dev/null || echo "No core files found"; \
-            for core in core.*; do \
-              if [ -f "$core" ]; then \
-                echo "Found core: $core"; \
-                exe=$(find target/release/deps -type f -executable -name "sapi_tests-*" ! -name "*.d" | head -1); \
-                if [ -n "$exe" ]; then \
-                  echo "Using executable: $exe"; \
-                  gdb -batch -ex "thread apply all bt" "$exe" "$core"; \
-                fi; \
-              fi; \
-            done; exit 1)
+        run: cargo test --workspace --release --features closure,embed,anyhow --no-fail-fast
 
   build-musl:
     name: musl / ${{ matrix.php }} / ${{ matrix.phpts[1] }}

src/embed/embed.c

@@ -44,6 +44,12 @@ SAPI_API void ext_php_rs_sapi_per_thread_init() {
   #endif
 }
 
+SAPI_API void ext_php_rs_sapi_per_thread_shutdown() {
+  #ifdef ZTS
+    ts_free_thread();
+  #endif
+}
+
 void ext_php_rs_php_error(int type, const char *format, ...) {
   va_list args;
   va_start(args, format);

src/embed/embed.h

@@ -9,5 +9,6 @@ void* ext_php_rs_embed_callback(int argc, char** argv, void* (*callback)(void *)
 void ext_php_rs_sapi_startup();
 void ext_php_rs_sapi_shutdown();
 void ext_php_rs_sapi_per_thread_init();
+void ext_php_rs_sapi_per_thread_shutdown();
 
 void ext_php_rs_php_error(int type, const char *format, ...);

src/embed/ffi.rs

@@ -20,6 +20,7 @@ unsafe extern "C" {
     pub fn ext_php_rs_sapi_startup();
     pub fn ext_php_rs_sapi_shutdown();
     pub fn ext_php_rs_sapi_per_thread_init();
+    pub fn ext_php_rs_sapi_per_thread_shutdown();
 
     pub fn ext_php_rs_php_error(
         type_: ::std::os::raw::c_int,

tests/sapi.rs

@@ -20,7 +20,7 @@ use std::ffi::c_char;
 use std::sync::Mutex;
 
 #[cfg(php_zts)]
-use ext_php_rs::embed::ext_php_rs_sapi_per_thread_init;
+use ext_php_rs::embed::{ext_php_rs_sapi_per_thread_init, ext_php_rs_sapi_per_thread_shutdown};
 #[cfg(php_zts)]
 use std::sync::Arc;
 #[cfg(php_zts)]
@@ -178,6 +178,10 @@ fn test_sapi_multithread() {
             unsafe {
                 php_request_shutdown(std::ptr::null_mut());
             }
+
+            unsafe {
+                ext_php_rs_sapi_per_thread_shutdown();
+            }
         });
 
         handles.push(handle);