ratomic 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ce16d80118e646fc2ba303d9571820f3fcaee5e16a0f4bdf759d213169c04a
-  data.tar.gz: 0ed04ad6cbb1550954e66922436337927a365b492cdce1208f7dacedbb54b463
+  metadata.gz: 73c8a9e8067cd54768d471f72fec834fbc4a865b70cb77ca784a2d4addace65a
+  data.tar.gz: 7e294ec44ad2e110f731aca962a5fe37f532e6f8d6f5d144e00fae575c347aa4
 SHA512:
-  metadata.gz: 29e4ac24a57f8d01f7fa4e16741358c82b7ce2c1ba599f31b6fe01f95f8670047c59d545d15697f61b5f3639a805027a03d91c1a12768558ee6bf8dd54b77ea8
-  data.tar.gz: 2994138cff4ef33a4498e93fc841ed4f35a891157c805190a3afbd58d3451f609954b2af59c59d8352a2e21939f0114cac0a0745e9c31d0a03bd2e3a1174b1a4
+  metadata.gz: abf7be9f9209c28b97e2bce3d224cd9c269d2cd7675a4d987f5d3121240648799f29910a704e17fb01081152945acadfe7be4d08cdd3db7247d8ddaf1211372d
+  data.tar.gz: 04eb14597dbc79dfef40fa74f56440edb61028f6de591ccdc0d1a0abc0fb4a8072edc18547c3b69ced8a3df60ede050e503ed2f732d41ed37578b66d966851a6

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## 0.4.3
+
+### Added
+
+- Expose `Pool#size` and `LocalPool#size` and add `shutdown` aliases for connection pool compatibility.
+
+## 0.4.2
+
+### Fixed
+
+- Prevent `Map#compute` from deadlocking when multiple Ruby threads contend for the same key.
+
 ## 0.4.1
 
 ### Documentation

data/ext/ratomic/src/hashmap.rs

@@ -54,6 +54,21 @@ impl MapStore {
         self.map.len()
     }
 
+    fn with_entry<F, R, W>(&self, key: VALUE, mut on_locked: W, f: F) -> R
+    where
+        F: FnOnce(Entry<'_, RubyHashEql, VALUE>) -> R,
+        W: FnMut(),
+    {
+        let mut f = Some(f);
+        loop {
+            if let Some(entry) = self.map.try_entry(RubyHashEql(key)) {
+                return f.take().expect("entry closure already used")(entry);
+            }
+
+            on_locked();
+        }
+    }
+
     pub fn fetch_and_modify<F>(&self, key: VALUE, f: F)
     where
         F: FnOnce(VALUE) -> VALUE,
@@ -61,11 +76,18 @@ impl MapStore {
         self.map.alter(&RubyHashEql(key), |_, value| f(value));
     }
 
-    pub fn compute<F, E>(&self, key: VALUE, missing: VALUE, f: F) -> Result<VALUE, E>
+    pub fn compute<F, E, W>(
+        &self,
+        key: VALUE,
+        missing: VALUE,
+        on_locked: W,
+        f: F,
+    ) -> Result<VALUE, E>
     where
         F: FnOnce(VALUE) -> Result<VALUE, E>,
+        W: FnMut(),
     {
-        match self.map.entry(RubyHashEql(key)) {
+        self.with_entry(key, on_locked, |entry| match entry {
             Entry::Occupied(mut entry) => {
                 let new_value = f(*entry.get())?;
                 entry.insert(new_value);
@@ -76,7 +98,7 @@ impl MapStore {
                 entry.insert(new_value);
                 Ok(new_value)
             }
-        }
+        })
     }
 
     pub fn update<F, E>(&self, key: VALUE, f: F) -> Result<VALUE, E>

data/ext/ratomic/src/lib.rs

@@ -18,7 +18,7 @@ use magnus::{
 use mpmc_queue::MpmcQueue;
 use parking_lot::Mutex;
 use rb_sys::{rb_ext_ractor_safe, rb_thread_call_without_gvl, ruby_special_consts, VALUE};
-use std::{ffi::c_void, mem::transmute};
+use std::{ffi::c_void, mem::transmute, time::Duration};
 
 fn value_to_raw(value: Value) -> VALUE {
     unsafe { transmute::<Value, VALUE>(value) }
@@ -38,6 +38,22 @@ fn make_shareable(ruby: &Ruby, value: Value) -> Result<Value, Error> {
     ractor.funcall("make_shareable", (value,))
 }
 
+unsafe extern "C" fn sleep_briefly_without_gvl(_: *mut c_void) -> *mut c_void {
+    std::thread::sleep(Duration::from_millis(1));
+    std::ptr::null_mut()
+}
+
+fn wait_for_entry_without_gvl() {
+    unsafe {
+        rb_thread_call_without_gvl(
+            Some(sleep_briefly_without_gvl),
+            std::ptr::null_mut(),
+            None,
+            std::ptr::null_mut(),
+        );
+    }
+}
+
 struct Counter(AtomicCounter);
 
 impl Counter {
@@ -158,10 +174,15 @@ impl HashMap {
         }
 
         let proc = ruby.block_proc()?;
-        let raw = rb_self.0.compute(value_to_raw(key), qnil_raw(), |value| {
-            proc.call::<_, Value>((unsafe { value_from_raw(value) },))
-                .map(value_to_raw)
-        })?;
+        let raw = rb_self.0.compute(
+            value_to_raw(key),
+            qnil_raw(),
+            wait_for_entry_without_gvl,
+            |value| {
+                proc.call::<_, Value>((unsafe { value_from_raw(value) },))
+                    .map(value_to_raw)
+            },
+        )?;
 
         Ok(unsafe { value_from_raw(raw) }.into_value_with(ruby))
     }

data/lib/ratomic/local_pool.rb

@@ -69,6 +69,7 @@ module Ratomic
   # @see Pool Use Pool for plain mutable Ruby values where ownership transfer
   #   is the desired safety model.
   class LocalPool
+    attr_reader :size
     # Create a per-Ractor local pool facade.
     #
     # @param size [Integer] maximum number of resources in each Ractor-local pool
@@ -127,6 +128,7 @@ module Ratomic
       pool.close
       nil
     end
+    alias_method :shutdown, :close
 
     # Minimal thread-safe resource pool used inside exactly one Ractor.
     class ResourcePool

data/lib/ratomic/pool.rb

@@ -26,6 +26,7 @@ module Ratomic
   #     buffer << :change
   #   end
   class Pool
+    attr_reader :size
     # Create a pool and seed it with +size+ objects from the factory block.
     #
     # @param size [Integer] number of pooled objects to create up front
@@ -37,6 +38,7 @@ module Ratomic
       raise ArgumentError, "pool size must be positive" if size <= 0
       raise LocalJumpError, "no block given" unless block_given?
 
+      @size = size
       @timeout = timeout&.to_f
       @control = self.class.send(:new_control_ractor)
       size.times { @control.send([:checkin, yield], move: true) }
@@ -88,6 +90,8 @@ module Ratomic
     rescue Ractor::ClosedError, Ractor::Error
       nil
     end
+    # backwards compatibility with ConnectionPool
+    alias_method :shutdown, :close
 
     # Checkout an object, yield it, then move it back to the pool.
     #

data/lib/ratomic/version.rb

@@ -2,5 +2,5 @@
 
 module Ratomic
   # Current gem version string.
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

data/sig/ratomic.rbs

@@ -68,6 +68,8 @@ module Ratomic
 
     def with: () { (untyped object) -> untyped } -> untyped
     def close: () -> nil
+    def shutdown: () -> nil
+    def size: () -> Integer
   end
 
   class Pool
@@ -76,6 +78,8 @@ module Ratomic
     def checkout: () -> untyped
     def checkin: (untyped object) -> nil
     def close: () -> nil
+    def shutdown: () -> nil
+    def size: () -> Integer
     def with: () { (untyped object) -> untyped } -> untyped
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ratomic
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Mike Perham
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Ractor-safe concurrent data structures for Ruby
 test_files: []