ractor-sharing 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88fa8b206f015cc52f9fb975060cd60ad960b4156a9b827aeb553a31ae34cf39
-  data.tar.gz: 00adc02e6a7c43bb44ec0c1b701bd3d8b6b1681df54cb3a4163a0b981a087da6
+  metadata.gz: f667d77a73e96a72c9cbaa28e3d45b7511aa5d3ecafe79d23923c89918d634a6
+  data.tar.gz: 99ae5d37d366f37c0d81da184a5ff15abe681a56af5cf4383841e9acb4a091e2
 SHA512:
-  metadata.gz: '0156339ebc1d6924032c142bd106036a9852c5564d01d25e4e198e7b5e11fc006bcfbdcfabe0ec3b26cb925acaa8c102f3690b7f05d5098d4cdf4b318967ee5b'
-  data.tar.gz: 7cdc6b398b61e1c202653116d6faad460f84a248d0867dde5905f27e6aee288278f91a3d16f0c4444316a4396105ade08a9562b7a8a064d6f627580ddc8e80cc
+  metadata.gz: ace4ea48c92eef46604b3743138609ff081325857138c1c581538aefb28a1636e993f0ce6a80c80796ad66beff047df648a829578767219476c970d233f58b3c
+  data.tar.gz: db8a6797917215ee087193ed345a75d7e619896a978e6a552ab7e2f85c19f017ccc33278b7e21acc452471b210247765629ef5420cfe34a9f7becc7686085a43

data/docs/lockhash.md

@@ -38,7 +38,7 @@ h = Ractor::LockHash.new(initial = nil)
 h[key]                # read
 h.fetch(key, default) # read, with the usual default / block / KeyError
 h.key?(key)
-h.keys / h.to_h       # a frozen, shareable snapshot of the whole hash
+h.keys / h.to_h       # a copy of the whole hash as it was at one moment
 h.inspect
 
 h.synchronize {|h| ... }   # the only place writes are allowed; yields the LockHash
@@ -55,7 +55,10 @@ that block **after** the lookup has released the lock, so a default that reads
 this hash again is fine.
 
 Keys and values must be **shareable**; `ArgumentError` otherwise. The LockHash
-itself is frozen and shareable, so it can be passed to any Ractor.
+itself is frozen and shareable, so it can be passed to any Ractor. `keys` and
+`to_h` return plain mutable copies, yours to reshape; everything inside them is
+shareable already, so `Ractor.make_shareable(h.to_h)` is all it takes to hand
+one to another Ractor.
 
 ### Writes only inside `synchronize`
 

data/ext/ractor/lock/lockhash.c

@@ -210,7 +210,7 @@ lockhash_collect_pair(st_data_t key, st_data_t value, st_data_t hash)
     return ST_CONTINUE;
 }
 
-/* A Hash of the entries as they are now; the caller freezes it if it escapes. */
+/* A Hash of the entries as they are now, owned by the calling Ractor. */
 static VALUE
 lockhash_snapshot(VALUE self)
 {
@@ -225,14 +225,14 @@ lockhash_keys_body(VALUE ptr)
     struct rs_guard_arg *arg = (struct rs_guard_arg *)ptr;
     VALUE keys = rb_ary_new_capa(lockhash_ptr(arg->self)->tbl->num_entries);
     st_foreach(lockhash_ptr(arg->self)->tbl, lockhash_collect_key, (st_data_t)keys);
-    return rb_ractor_make_shareable(keys);
+    return keys;
 }
 
 static VALUE
 lockhash_to_h_body(VALUE ptr)
 {
     struct rs_guard_arg *arg = (struct rs_guard_arg *)ptr;
-    return rb_ractor_make_shareable(lockhash_snapshot(arg->self));
+    return lockhash_snapshot(arg->self);
 }
 
 static VALUE
@@ -289,8 +289,11 @@ lockhash_key_p(VALUE self, VALUE key)
  *     lockhash.keys -> array
  *     lockhash.to_h -> hash
  *
- *  A snapshot taken under the lock, frozen and shareable, of the whole hash as
- *  it was at one moment.
+ *  A snapshot taken under the lock of the whole hash as it was at one moment:
+ *  a plain mutable copy, the caller's own.  Not frozen -- freezing protected
+ *  nothing (the LockHash never sees the copy again) and only stopped the
+ *  caller reshaping it.  Everything inside is shareable, so make_shareable is
+ *  one cheap call away when it has to cross to another Ractor.
  */
 static VALUE
 lockhash_keys(VALUE self)

data/lib/ractor/active_object.rb

@@ -122,7 +122,10 @@ class Ractor
         raise Error, "owner Ractor #{owner.inspect} terminated during initialization" if src.equal?(owner)
         raise __ao_restore_exception__(payload, backtrace) if status == :raise
 
-        Ractor.make_shareable(proxy_class.new(owner, payload))
+        # The proxy the owner built: there is exactly one per active object, so
+        # a method that returns self hands back this same object, and .equal?
+        # means what it says.
+        payload
       end
 
       # Class of the proxies returned by .new (a subclass of ActiveObject::Proxy).
@@ -208,9 +211,11 @@ class Ractor
           __ao_reply__(boot, :raise, e)
           return
         end
-        boot << [:ok, port]
-
-        proxy = klass.proxy_class.new(Ractor.current, port).freeze
+        # The one proxy for this object, made shareable so it crosses every
+        # port by reference: .new returns it, and so does a method returning
+        # self.  A bare .freeze here used to leave .new building a second one.
+        proxy = Ractor.make_shareable(klass.proxy_class.new(Ractor.current, port))
+        boot << [:ok, proxy]
         pending = pending_name = nil
         begin
           loop do

data/lib/ractor/sharing/version.rb

@@ -2,6 +2,6 @@
 
 class Ractor
   module Sharing
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ractor-sharing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Koichi Sasada