backports 3.20.0 → 3.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d95602bc2a5f1d8835d424036e6d51671baa7c8d46f4482c61b6519044d493
-  data.tar.gz: '059fa80520c54c368ad38f6477bbb2b9debe734970b0e007ba04be2b37c0138f'
+  metadata.gz: aa5429b607594bcd855bad1a66bbfdc01e3facb1f76be0c338fd549b502ec1c4
+  data.tar.gz: e7e08e840cc7559df5708a0bfa5d1499a3e809fb9bf79b260e4c98e7ca634c60
 SHA512:
-  metadata.gz: 0b4031dc752ebb19df160368c272e37b0bf9a939288ccccc9d5043567efed030d157d2da1668ec0787216ab05f730b3ff8d7c23b78a5e2400719cd5183232a69
-  data.tar.gz: c92bbe1f69c27f5ed6e18162e8fe96665a9828480bd2c10a13750f1b8190db53a0ef25b2009f2414cb3d193e22c0810b12a259ef84d079bac6f53dde9aafcd96
+  metadata.gz: 5e59f88a7ef8c1487cc1c1fb04d28a96d44b26d8cc5379a6ea9f18edfca62d97fe0b84c27a03c600a6137febf9096917f0ec1d7a52574fc536f7c345b2e256af
+  data.tar.gz: 9e732e7626034ae45dd1daf0cd54f20319854f27f041c5624e8c96d287a66ffeee780e8d0c142472e8b88cba597b65ee300b161b811acade9aaa697ff3352ff7

data/CHANGELOG.md

@@ -8,6 +8,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 Note: [Next major version (X-mas 2021?)](https://github.com/marcandre/backports/issues/139) may drop support for Ruby < 2.2, please comment.
 
+## [3.20.1](https://github.com/marcandre/backports/compare/v3.20.0...v3.20.1) - 2021-01-03
+
+### Fixed
+
+* Added `Ractor.[]` and `[]=` [#161]
+* `Ractor.current` fixed from threads [#161]
+
 ## [3.20.0](https://github.com/marcandre/backports/compare/v3.19.0...v3.20.0) - 2020-12-30
 
 ### Added

data/lib/backports/ractor/ractor.rb

@@ -8,6 +8,8 @@ class Ractor
   require_relative 'queues'
   require_relative 'sharing'
 
+  RactorThreadGroups = ::ObjectSpace::WeakMap.new # ThreadGroup => Ractor
+  private_constant :RactorThreadGroups
   # Implementation notes
   #
   # Uses one `Thread` for each `Ractor`, as well as queues for communication
@@ -37,7 +39,7 @@ class Ractor
     if Ractor.main == nil # then initializing main Ractor
       @ractor_thread = ::Thread.current
       @ractor_origin = nil
-      @ractor_thread.thread_variable_set(:ractor, self)
+      @ractor_thread.thread_variable_set(:backports_ractor, self)
     else
       @ractor_origin = caller(1, 1).first.split(':in `').first
 
@@ -47,10 +49,12 @@ class Ractor
   end
 
   private def ractor_thread_start(args, block)
-    Thread.new do
+    ::Thread.new do
       @ractor_thread = Thread.current
-      @ractor_thread_group = ThreadGroup.new.add(@ractor_thread)
-      ::Thread.current.thread_variable_set(:ractor, self)
+      @ractor_thread_group = ThreadGroup.new
+      RactorThreadGroups[@ractor_thread_group] = self
+      @ractor_thread_group.add(@ractor_thread)
+      ::Thread.current.thread_variable_set(:backports_ractor, self)
       result = nil
       begin
         result = instance_exec(*args, &block)
@@ -139,6 +143,19 @@ class Ractor
     ractor_incoming_queue.pop(&block)
   end
 
+  def [](key)
+    Ractor.current.ractor_locals[key]
+  end
+
+  def []=(key, value)
+    Ractor.current.ractor_locals[key] = value
+  end
+
+  # @api private
+  def ractor_locals
+    @ractor_locals ||= {}.compare_by_identity
+  end
+
   class << self
     def yield(value, move: false)
       value = ractor_isolate(value, move)
@@ -198,7 +215,8 @@ class Ractor
     end
 
     def current
-      Thread.current.thread_variable_get(:ractor)
+      Thread.current.thread_variable_get(:backports_ractor) ||
+        Thread.current.thread_variable_set(:backports_ractor, ractor_find_current)
     end
 
     def count
@@ -222,6 +240,11 @@ class Ractor
     private def ractor_init
       @ractor_shareable = ::ObjectSpace::WeakMap.new
       @main = Ractor.new { nil }
+      RactorThreadGroups[::ThreadGroup::Default] = @main
+    end
+
+    private def ractor_find_current
+      RactorThreadGroups[Thread.current.group]
     end
   end
 

data/lib/backports/version.rb

@@ -1,3 +1,3 @@
 module Backports
-  VERSION = "3.20.0" unless Backports.constants.include? :VERSION # the guard is against a redefinition warning that happens on Travis
+  VERSION = "3.20.1" unless Backports.constants.include? :VERSION # the guard is against a redefinition warning that happens on Travis
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backports
 version: !ruby/object:Gem::Version
-  version: 3.20.0
+  version: 3.20.1
 platform: ruby
 authors:
 - Marc-André Lafortune
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-03 00:00:00.000000000 Z
 dependencies: []
 description: Essential backports that enable many of the nice features of Ruby for
   earlier versions.