async-safe 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7859608fbc62080a81bb9f20ce2c9ffe8f299f76432d1ec9f4a3d4aa47291240
-  data.tar.gz: e9a4f441e4ccdbfe0f086d6df486f22c7aa9504d07f42128689f54fd1befad4d
+  metadata.gz: 72500ee1207a863df7f749896936bf9edce7e06f2f7d7a519329c0ada72951eb
+  data.tar.gz: 584c0393294503ea01cf1e1858f88f3c2faf5e2cd6fdf1b2f632af0708e4d787
 SHA512:
-  metadata.gz: 12d90b93da4da2d525d6bf9e14acf235f0a2c50bc8301cd265b88f333a9d8c9af55ed0a7d69cb992239af715f5cd680650de0d2b111fb474c3a487f1007acfdb
-  data.tar.gz: 84d82aa42d46b54494ac5f4c8b025c80f41b2c8ccb7e1412d89a5d1073c662f9b86c7a84dce7c782c73e97164fc8a2df0a5d064bb4dac83a9e0de3d7a85cc264
+  metadata.gz: 305ea4886f6b9fa0452de045244623806ed824ba24791ed0d2d1e6bf96a14f536f31fccbd54f099e5cc10ee1dc39067609be9b646daac413c47126a86f0306a2
+  data.tar.gz: 78dd7ab4aab4893c2824788e03522905698d6f400557976677253fbcc53643b4a0dbaaa8a8157249415f9380a317ffddc126948bb484fa2b6c795513abf4fc2d

data/lib/async/safe/builtins.rb

@@ -12,6 +12,10 @@
 class Array
 	ASYNC_SAFE = false
 	
+	# Traverse array elements during ownership transfer.
+	#
+	# @parameter instance [Array] The array instance to traverse.
+	# @parameter block [Proc] Block to call for each element.
 	def self.async_safe_traverse(instance, &block)
 		instance.each(&block)
 	end
@@ -21,6 +25,10 @@ end
 class Hash
 	ASYNC_SAFE = false
 	
+	# Traverse hash keys and values during ownership transfer.
+	#
+	# @parameter instance [Hash] The hash instance to traverse.
+	# @parameter block [Proc] Block to call for each key and value.
 	def self.async_safe_traverse(instance, &block)
 		instance.each_key(&block)
 		instance.each_value(&block)
@@ -31,6 +39,10 @@ end
 class Set
 	ASYNC_SAFE = false
 	
+	# Traverse set elements during ownership transfer.
+	#
+	# @parameter instance [Set] The set instance to traverse.
+	# @parameter block [Proc] Block to call for each element.
 	def self.async_safe_traverse(instance, &block)
 		instance.each(&block)
 	end

data/lib/async/safe/monitor.rb

@@ -6,6 +6,9 @@
 require "set"
 require "weakref"
 
+# Fiber-local variable to track when we're in a transfer operation:
+Fiber.attr_accessor :async_safe_transfer
+
 module Async
 	module Safe
 		# Raised when an object is accessed from a different fiber than the one that owns it.
@@ -95,28 +98,31 @@ module Async
 				current = Fiber.current
 				visited = Set.new
 				
-				# Traverse object graph (outside mutex to avoid deadlock):
-				objects.each do |object|
-					traverse_objects(object, visited)
-				end
-				
-				# Transfer all visited objects (convert to array to avoid triggering TracePoint in sync block):
-				objects_to_transfer = visited.to_a
+				# Disable tracking during traversal to avoid deadlock:
+				current.async_safe_transfer = true
 				
-				@mutex.synchronize do
-					objects_to_transfer.each do |object|
-						@owners[object] = current if @owners.key?(object)
+				begin
+					# Traverse object graph:
+					objects.each do |object|
+						traverse_objects(object, visited)
 					end
+					
+					# Transfer all visited objects:
+					@mutex.synchronize do
+						visited.each do |object|
+							@owners[object] = current if @owners.key?(object)
+						end
+					end
+				ensure
+					current.async_safe_transfer = false
 				end
 			end
 			
-			private
-			
 			# Traverse the object graph and collect all reachable objects.
 			#
 			# @parameter object [Object] The object to traverse.
 			# @parameter visited [Set] Set of visited objects (object references, not IDs).
-			def traverse_objects(object, visited)
+			private def traverse_objects(object, visited)
 				# Avoid circular references:
 				return if visited.include?(object)
 				
@@ -140,6 +146,9 @@ module Async
 			#
 			# @parameter trace_point [TracePoint] The trace point containing access information.
 			def check_access(trace_point)
+				# Skip if we're in a transfer operation:
+				return if Fiber.current.async_safe_transfer
+				
 				object = trace_point.self
 				
 				# Skip tracking class/module methods:

data/lib/async/safe/version.rb

@@ -5,7 +5,7 @@
 
 module Async
 	module Safe
-		VERSION = "0.4.0"
+		VERSION = "0.4.1"
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-safe
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Samuel Williams