Merge branch 'main' into copilot/fix-94

Author: fengmk2

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
             target: x86_64-unknown-linux-gnu
           # - os: windows-latest
           #   target: x86_64-pc-windows-msvc
-          - os: blaze/macos-latest
+          - os: macos-latest
             target: aarch64-apple-darwin
     runs-on: ${{ matrix.os }}
     steps:
@@ -59,7 +59,7 @@ jobs:
 
   lint:
     name: Lint
-    runs-on: blaze/macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
@@ -81,7 +81,7 @@ jobs:
 
   run:
     name: Run task
-    runs-on: blaze/macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
@@ -118,7 +118,7 @@ jobs:
 
   e2e-test:
     name: E2E test
-    runs-on: blaze/macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
@@ -172,3 +172,15 @@ jobs:
             echo "✓ Successfully installed dependencies for $repo"
             echo ""
           done
+
+  done:
+    runs-on: ubuntu-latest
+    needs:
+      - test
+      - lint
+      - run
+      - e2e-test
+    steps:
+      - run: exit 1
+        # Thank you, next https://github.com/vercel/next.js/blob/canary/.github/workflows/build_and_test.yml#L379
+        if: ${{ always() && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')) }}

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   build-rust:
-    runs-on: blaze/macos-latest
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -39,7 +39,7 @@ jobs:
       - uses: mlugg/setup-zig@8d6198c65fb0feaa111df26e6b467fea8345e46f # v2.0.5
         if: ${{ contains(matrix.target, 'linux') }}
         with:
-          version: 0.14.1
+          version: 0.15.1
 
       - uses: taiki-e/install-action@ad95d4e02e061d4390c4b66ef5ed56c7fee3d2ce # v2.58.17
         if: ${{ contains(matrix.target, 'linux') }}
@@ -94,7 +94,7 @@ jobs:
           if-no-files-found: error
 
   Release:
-    runs-on: blaze/macos-latest
+    runs-on: ubuntu-latest
     needs: build-rust
     permissions:
       contents: read

crates/fspy_preload_unix/src/client/mod.rs

@@ -18,7 +18,7 @@ use std::{
         LazyLock, OnceLock,
         atomic::{AtomicU8, AtomicU16, AtomicUsize, Ordering, fence},
     },
-    thread::panicking,
+    thread::{AccessError, panicking},
     time::{Instant, SystemTime},
 };
 
@@ -67,10 +67,13 @@ impl ShmCursor {
     }
 }
 
+thread_local! {
+    static SHM_CURSOR: RefCell<Option<ShmCursor>> = RefCell::new(None);
+}
+
 pub struct Client {
     encoded_payload: EncodedPayload,
     shm_id: AtomicUsize,
-    tls_shm_cursor: ThreadLocal<RefCell<ShmCursor>>,
 
     #[cfg(target_os = "macos")]
     posix_spawn_file_actions: OnceLock<libc::posix_spawn_file_actions_t>,
@@ -95,7 +98,6 @@ impl Client {
         Self {
             shm_id: AtomicUsize::new(0),
             encoded_payload,
-            tls_shm_cursor: ThreadLocal::new(),
             #[cfg(target_os = "macos")]
             posix_spawn_file_actions: OnceLock::new(),
         }
@@ -118,26 +120,35 @@ impl Client {
         Ok(ShmCursor { mmap_mut, position: 0 })
     }
 
-    fn with_shm_buf<R>(
+    fn with_shm_buf(
         &self,
         len: usize,
-        f: impl FnOnce(&mut [u8]) -> anyhow::Result<R>,
-    ) -> anyhow::Result<R> {
-        let shm_buf =
-            self.tls_shm_cursor.get_or_try(|| io::Result::Ok(RefCell::new(self.new_shm()?)))?;
+        f: impl FnOnce(&mut [u8]) -> anyhow::Result<()>,
+    ) -> anyhow::Result<()> {
+        let result = SHM_CURSOR.try_with(|shm_cursor| {
+            let mut shm_cursor = shm_cursor.borrow_mut();
+            let shm_buf = if let Some(some) = shm_cursor.as_mut() {
+                some
+            } else {
+                shm_cursor.insert(self.new_shm()?)
+            };
 
-        let mut shm_buf = shm_buf.borrow_mut();
-        if let Some(buf) = shm_buf.advance(len) {
-            f(buf)
-        } else {
-            *shm_buf = self.new_shm()?;
-            let buf = shm_buf.advance(len).with_context(|| {
-                format!(
-                    "The requested buf ({}) is greater than the shm chunk size ({})",
-                    len, SHM_CHUNK_SIZE
-                )
-            })?;
-            f(buf)
+            if let Some(buf) = shm_buf.advance(len) {
+                f(buf)
+            } else {
+                *shm_buf = self.new_shm()?;
+                let buf = shm_buf.advance(len).with_context(|| {
+                    format!(
+                        "The requested buf ({}) is greater than the shm chunk size ({})",
+                        len, SHM_CHUNK_SIZE
+                    )
+                })?;
+                f(buf)
+            }
+        });
+        match result {
+            Ok(ok) => ok,
+            Err(_) => Ok(()), // Ignore AccessError. TODO(fix): handle AccessError
         }
     }
 
@@ -290,11 +301,14 @@ fn init_client() {
         let Some(client) = global_client() else {
             return;
         };
-        if let Some(shm_cursor) = client.tls_shm_cursor.get() {
-            // Move the shm cursor to the end so that the next time it's used it will be reset.
+        let _ = SHM_CURSOR.try_with(|shm_cursor| {
+            // Move the shm cursor to the end so that the next time it's used a new one will be created.
             let mut shm_cursor = shm_cursor.borrow_mut();
+            let Some(shm_cursor) = shm_cursor.as_mut() else {
+                return;
+            };
             shm_cursor.position = shm_cursor.mmap_mut.len();
-        }
+        });
     }
     let ret = unsafe { pthread_atfork(None, None, Some(reset_shm_atfork)) };
     if ret != 0 {