spinel_native 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 861579157d9270857eede60bc891c64f7b6b78c152a62512ef0ad098f112fad4
-  data.tar.gz: 132e7349789d035475fd5386ffa5bf6c60b39a3c08880e9adcd01244563d2e4e
+  metadata.gz: 6eb84c9447a7802b37d923c0fc03328b913d196cd7394f45f7d8ff8ebdae61f8
+  data.tar.gz: a4761840558347f8d65510053ce013351011ed8a98dfe21e463b3c93e7ba1198
 SHA512:
-  metadata.gz: b195d6cf158a5bc71c802c7f181f9956a868c1989fd3901c6cd2ea93bfd04ddcb40eaf08fcd92e34e09f10253a4403ce2ef4275aa2d084332d6c75a7318ea1f2
-  data.tar.gz: 2ed20f171858b8f635bfda4dc66cbad803235430bd162a3cdbc32b3b8dc741acb4638f618c0b361b5eb4d3789b8a3dd094354df457ee6546fc14efe8810edc90
+  metadata.gz: 3a16adfa8b94475d39fa61eea71cd6e886977efa37207517204fc30a96e8478e139d7efd33837e23cc71b1b9cfa559274d825ff79514e58072fb997ff46ed17b
+  data.tar.gz: d898452eff97062057a9dbd82d112bfd35653fce9ce8b8a27adc208644950e7510aeb18e43bd41cc627ae25d56d73c972a746c3ae58ebe2b0518f916fc317787

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.3.1 (2026-09-20)
+
+- Run the kernel with the GVL held. The CRuby shim Spinel emits locks its
+  mutex under the GVL and then releases the GVL for the call, which deadlocks
+  on the second concurrent call from another Ruby thread (Puma under load).
+  Until the shim is fixed upstream, spinel_native rewrites the call site so
+  the kernel runs under the GVL; kernels no longer overlap other Ruby threads.
+- The build cache key includes the spinel_native version.
+
 ## 0.3.0 (2026-09-18)
 
 - `native_entries :a, :b`: in a stateful kernel, name the methods called from

data/README.md

@@ -284,8 +284,8 @@ SPINEL_NATIVE_VERBOSE=1             # print the commands and timings
 - A `raise` inside the kernel arrives in Ruby as the same exception class and
   message. Integer overflow raises `RangeError` where CRuby would promote to a
   Bignum, and a Bignum argument is a `RangeError` at the boundary.
-- The kernel runs without the GVL, one call at a time per module, so
-  `native_state` needs no locking of its own.
+- Kernels run one call at a time per module, with the GVL held (see the
+  0.3.1 changelog for why), so `native_state` needs no locking of its own.
 - In a stateful module with `native_entries`, only the entries reach the
   kernel's state. A non-entry method called from Ruby runs as Ruby, on the
   module's own ivars.

data/lib/spinel/native/builder.rb

@@ -55,7 +55,7 @@ module Spinel
         def fingerprint
           @fingerprint ||= begin
             st = File.stat(spinel_bin)
-            Digest::SHA256.hexdigest([st.size, st.mtime.to_i, RUBY_VERSION, RUBY_PLATFORM, RbConfig::CONFIG["CC"]].join("|"))
+            Digest::SHA256.hexdigest([st.size, st.mtime.to_i, RUBY_VERSION, RUBY_PLATFORM, RbConfig::CONFIG["CC"], VERSION].join("|"))
           end
         end
 
@@ -158,6 +158,23 @@ module Spinel
                "--ext", "cruby", "--ext-init", "spx_init_#{@feature}", "--ext-entry", entry_list,
                "-o", File.join(@dir, "#{@feature}.c")]
         sh(cmd, "spinel")
+        keep_gvl(File.join(@dir, "#{@feature}_ext.c"))
+      end
+
+      # The shim Spinel emits takes its mutex while holding the GVL and then
+      # releases the GVL for the kernel call. A second Ruby thread entering
+      # the shim blocks on the mutex with the GVL held, the first cannot take
+      # the GVL back to unlock, and the process deadlocks on its second
+      # concurrent call (reproduced under Puma with wrk). Until the shim
+      # orders the two the other way round, run the kernel with the GVL held:
+      # the mutex is then never contended and the conversions, which touch
+      # the single-threaded Spinel heap, are serialized too. The cost is that
+      # kernels do not overlap with other Ruby threads.
+      def keep_gvl(shim)
+        src = File.read(shim)
+        patched = src.gsub(/rb_thread_call_without_gvl\((spx_run_\d+), &c__, RUBY_UBF_IO, NULL\)/, '\1(&c__)')
+        raise CompileError, "unexpected shim shape in #{shim}: no rb_thread_call_without_gvl call sites" if patched == src
+        File.write(shim, patched)
       end
 
       # Every kernel carries its own copy of the runtime and exports the same

data/lib/spinel/native/version.rb

@@ -2,6 +2,6 @@
 
 module Spinel
   module Native
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinel_native
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Chris Hasiński
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Compile individual Ruby methods to native code with the Spinel AOT compiler
 test_files: []