hakuban 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12beca62a4975af1ee3f85d5ec83e85753a6f6bb95fb36529c284d88eba41c5
-  data.tar.gz: ca7a3c890c4ba1b7dc337ac1e3120b8d5d260c8170f641493067b5f75060c3ab
+  metadata.gz: 6d0b0d54e3b6dce8ecd11b991e94768247f2e978cca397d430fcab6bfd987484
+  data.tar.gz: 81466178ba54513cb665cd49800599125bda1ba108f7eee71efff3e5b496cbb5
 SHA512:
-  metadata.gz: fb3e86f190c140edb9658f42f33cb9bfdad718cb6b04a9f1bced7240ed2b64716d43ab651f3551b4ee084d103fdfc3bf038dc7e3f91332f1bac692e5b9b7001f
-  data.tar.gz: fd40ec84a8e7f713f857768e84dd0f5554beb00adf586adf7e739e12e1920cb568387df5cc8c4085c7bec83fbffc36a5d16bbe7211481774e849b5dda402fab6
+  metadata.gz: dc7157372663dc871a85b36ee042e0fc12b66ad45fb322398b593086b47896167ab4cb913ab8b1f636071a9a006d2a3ab3af34b6d32e4024d7f3121dc4d9e19c
+  data.tar.gz: 6b0b7c59f66be811b16322574f8f0670c5802760b8cf8e690b3d4fa4107ea17dffa1e085c0c9607a72fa0a025eef0665087d5b18b0d671e43bab1cf7b5eea95f

data/lib/hakuban/event-queue.rb

@@ -0,0 +1,77 @@
+#TODO: rebuild to handle event squashing on rust side
+
+require 'ostruct'
+
+require_relative './ffi.rb'
+
+
+module Hakuban
+
+	class Event < OpenStruct; end
+
+	class ObjectDescriptorCallbackEventQueue
+
+		def initialize(pointer)
+			@events_pointer = ::FFI::AutoPointer.new(pointer, proc { |ptr| FFI.hakuban_object_descriptor_events_return(ptr) })
+		end
+
+
+		# WARNING: this callback may be run from a separate, non-ruby, thread
+		def callback_register(&callback)
+			ffi_callback = proc { |_userdata, ffi_descriptor, ffi_action|
+				action = Hakuban::action_int_to_symbol(ffi_action)
+				descriptor = ObjectDescriptor.from_ffi(ffi_descriptor)
+				callback.call(descriptor, action)
+			}
+			@callback_pointer = ::FFI::AutoPointer.new(
+				FFI::hakuban_object_descriptor_events_callback_register(@events_pointer, ffi_callback, ::FFI::Pointer::NULL),
+				proc { |ptr| FFI::hakuban_object_descriptor_events_callback_unregister(ptr) }
+			)
+		end
+
+
+		def callback_unregister
+			@callback_pointer.free
+			@callback_pointer = nil
+		end
+
+
+		def drop
+			@events_pointer.free
+			@events_pointer = nil
+		end
+
+	end
+
+
+	class ObjectDescriptorEventQueue
+
+		def initialize(contract)
+			@contract = contract
+			@queue = Queue.new
+			@ffi_callback = proc { |descriptor, action|
+				@queue << Hakuban::Event.new(action: action, descriptor: descriptor)
+			}
+			@ffi_events = @contract.new_callback_event_queue
+			@ffi_events.callback_register(&@ffi_callback)
+		end
+
+
+		#def push(event)
+		#	@queue << event
+		#end
+
+
+		def next_event; next_change; end
+		def next_change
+			@queue.pop
+		end
+		
+
+		def close
+			@queue.close
+		end
+
+	end
+
+end

data/lib/hakuban/hakuban.rb

@@ -2,6 +2,7 @@ require 'set'
 require 'ostruct'
 
 require_relative './ffi.rb'
+require_relative './event-queue.rb'
 
 #TODO: explicit drops?
 #TODO: privative methods
@@ -215,36 +216,6 @@ module Hakuban
 	end
 
 
-	class ObjectDescriptorEvents
-		def initialize(pointer)
-			@events_pointer = ::FFI::AutoPointer.new(pointer, proc { |ptr| FFI.hakuban_object_descriptor_events_return(ptr) })
-		end
-
-		# WARNING: this callback may be run from a separate, non-ruby, thread
-		def callback_register(&callback)
-			ffi_callback = proc { |_userdata, ffi_descriptor, ffi_action|
-				action = Hakuban::action_int_to_symbol(ffi_action)
-				descriptor = ObjectDescriptor.from_ffi(ffi_descriptor)
-				callback.call(descriptor, action)
-			}
-			@callback_pointer = ::FFI::AutoPointer.new(
-				FFI::hakuban_object_descriptor_events_callback_register(@events_pointer, ffi_callback, ::FFI::Pointer::NULL),
-				proc { |ptr| FFI::hakuban_object_descriptor_events_callback_unregister(ptr) }
-			)
-		end
-
-		def callback_unregister
-			@callback_pointer.free
-			@callback_pointer = nil
-		end
-
-		def drop
-			@events_pointer.free
-			@events_pointer = nil
-		end
-
-	end
-
 	class ObjectObserve
 
 		attr_reader :descriptor
@@ -253,6 +224,7 @@ module Hakuban
 			@local_node, @descriptor, @deserializer = local_node, descriptor, deserializer
 			result = FFI::hakuban_object_observe_new(@local_node.local_node_pointer, descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
+			@queues = []
 			@object_observe_pointer = ::FFI::AutoPointer.new(result[:object_observe_pointer], proc { |ptr| FFI::hakuban_object_observe_drop(ptr) })
 		end
 
@@ -265,9 +237,16 @@ module Hakuban
 			end
 		end
 
-		def events
+		def new_callback_event_queue
 			raise "Attempt to use after 'drop'"  if not @object_observe_pointer
-			ObjectDescriptorEvents.new(FFI::hakuban_object_observe_events_get(@object_observe_pointer))
+			ObjectDescriptorCallbackEventQueue.new(FFI::hakuban_object_observe_events_get(@object_observe_pointer))
+		end 
+
+		def new_event_queue
+			raise "Attempt to use after 'drop'"  if not @object_observe_pointer
+			queue = ObjectDescriptorEventQueue.new(self)
+			@queues << queue
+			queue
 		end
 
 		def inspect
@@ -277,6 +256,8 @@ module Hakuban
 		def drop
 			@object_observe_pointer.free
 			@object_observe_pointer = nil
+			@queues.each(&:close)  #is this atomic?
+			@queues.clear
 		end
 
 		def dropped?
@@ -294,6 +275,7 @@ module Hakuban
 			@local_node, @descriptor, @serializer = local_node, descriptor, serializer
 			result = FFI::hakuban_object_expose_new(@local_node.local_node_pointer, descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
+			@queues = []
 			@object_expose_pointer = ::FFI::AutoPointer.new(result[:object_expose_pointer], FFI::method(:hakuban_object_expose_drop))
 		end
 
@@ -319,9 +301,16 @@ module Hakuban
 			FFI::hakuban_object_expose_desynchronize(@object_expose_pointer, assignment)
 		end
 
-		def events
+		def new_callback_event_queue
+			raise "Attempt to use after 'drop'"  if not @object_expose_pointer
+			ObjectDescriptorCallbackEventQueue.new(FFI::hakuban_object_expose_events_get(@object_expose_pointer))
+		end
+
+		def new_event_queue
 			raise "Attempt to use after 'drop'"  if not @object_expose_pointer
-			ObjectDescriptorEvents.new(FFI::hakuban_object_expose_events_get(@object_expose_pointer))
+			queue = ObjectDescriptorEventQueue.new(self)
+			@queues << queue
+			queue
 		end
 
 		def inspect
@@ -331,7 +320,8 @@ module Hakuban
 		def drop
 			@object_expose_pointer.free
 			@object_expose_pointer = nil
-		end
+			@queues.each(&:close)  #is this atomic?
+			@queues.clear		end
 
 		def dropped?
 			@object_expose_pointer.nil?
@@ -394,6 +384,7 @@ module Hakuban
 			@local_node, @descriptor, @deserializer = local_node, descriptor, deserializer
 			result = FFI::hakuban_tag_observe_new(@local_node.local_node_pointer, @descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
+			@queues = []
 			@tag_observe_pointer = ::FFI::AutoPointer.new(result[:tag_observe_pointer], FFI::method(:hakuban_tag_observe_drop))
 		end
 
@@ -413,14 +404,23 @@ module Hakuban
 			ObjectObserveState.new(result[:state], @deserializer)
 		end
 
-		def events
+		def new_callback_event_queue
 			raise "Attempt to use after 'drop'"  if not @tag_observe_pointer
-			ObjectDescriptorEvents.new(FFI::hakuban_tag_observe_events_get(@tag_observe_pointer))
+			ObjectDescriptorCallbackEventQueue.new(FFI::hakuban_tag_observe_events_get(@tag_observe_pointer))
+		end
+
+		def new_event_queue
+			raise "Attempt to use after 'drop'"  if not @tag_observe_pointer
+			queue = ObjectDescriptorEventQueue.new(self)
+			@queues << queue
+			queue
 		end
 
 		def drop
 			@tag_observe_pointer.free
 			@tag_observe_pointer = nil
+			@queues.each(&:close)  #is this atomic?
+			@queues.clear
 		end
 
 		def dropped?
@@ -438,6 +438,7 @@ module Hakuban
 			@local_node, @descriptor, @serializer = local_node, descriptor, serializer
 			result = FFI::hakuban_tag_expose_new(@local_node.local_node_pointer, descriptor.to_ffi)
 			Hakuban::raise_if_error(result)
+			@queues = []
 			@tag_expose_pointer = ::FFI::AutoPointer.new(result[:tag_expose_pointer], FFI::method(:hakuban_tag_expose_drop))
 		end
 
@@ -472,14 +473,23 @@ module Hakuban
 			FFI::hakuban_tag_expose_object_desynchronize(@tag_expose_pointer, object_descriptor.to_ffi, assignment)
 		end
 
-		def events
+		def new_callback_event_queue
+			raise "Attempt to use after 'drop'"  if not @tag_expose_pointer
+			ObjectDescriptorCallbackEventQueue.new(FFI::hakuban_tag_expose_events_get(@tag_expose_pointer))
+		end
+
+		def new_event_queue
 			raise "Attempt to use after 'drop'"  if not @tag_expose_pointer
-			ObjectDescriptorEvents.new(FFI::hakuban_tag_expose_events_get(@tag_expose_pointer))
+			queue = ObjectDescriptorEventQueue.new(self)
+			@queues << queue
+			queue
 		end
 
 		def drop
 			@tag_expose_pointer.free
 			@tag_expose_pointer = nil
+			@queues.each(&:close)  #is this atomic?
+			@queues.clear
 		end
 
 		def dropped?

data/lib/hakuban/manager.rb

@@ -14,6 +14,7 @@ module Hakuban
 
 		def initialize(contract, object_class, block)
 			@contract = contract
+			@objects_mutex = Mutex.new
 			@objects = {}
 			@running_handlers = {}
 			@event_queue = Queue.new
@@ -23,60 +24,75 @@ module Hakuban
 			@ffi_callback = proc { |descriptor, action|
 				@event_queue << Event.new(action: action, descriptor: descriptor)
 			}
-			@ffi_events = @contract.events
+			@ffi_events = @contract.new_callback_event_queue
 			@ffi_events.callback_register(&@ffi_callback)
 
 			@async = async_run {
-				while event = @event_queue.shift
-					case event.action
-					when :insert
-						raise  if @objects[event.descriptor]
-						@objects[event.descriptor] = object_class.new(@contract, event.descriptor)
-						@event_queue << Event.new(action: :handler_start, descriptor: event.descriptor)  if block
-					when :change
-						raise  if not @objects[event.descriptor]
-						@objects[event.descriptor].do_change(:change)
-					when :remove
-						raise  if not @objects[event.descriptor]
-						@objects[event.descriptor].do_change(:remove)
-						@objects.delete(event.descriptor)
-					when :handler_start
-						if (object = @objects[event.descriptor]) and !object.handler_already_run and !@running_handlers[event.descriptor]
-							descriptor_for_lambda = event.descriptor	
-							@running_handlers[event.descriptor] = async_run {
-								object.run(block)
-								@event_queue << Event.new(action: :handler_finished, descriptor: descriptor_for_lambda)  if @event_queue
-							}
+				while @event_queue and event = @event_queue.shift
+					@objects_mutex.synchronize {
+						case event.action
+						when :insert
+							raise  if @objects[event.descriptor]
+							@objects[event.descriptor] = object_class.new(@contract, event.descriptor)
+							@event_queue << Event.new(action: :handler_start, descriptor: event.descriptor)  if block
+						when :change
+							raise  if not @objects[event.descriptor]
+							@objects[event.descriptor].do_change(:change)
+						when :remove
+							raise  if not @objects[event.descriptor]
+							@objects[event.descriptor].do_change(:remove)
+							@objects.delete(event.descriptor)
+						when :handler_start
+							if (object = @objects[event.descriptor]) and !object.handler_already_run and !@running_handlers[event.descriptor]
+								descriptor_for_lambda = event.descriptor	
+								@running_handlers[event.descriptor] = async_run {
+									object.run(block)
+									@event_queue << Event.new(action: :handler_finished, descriptor: descriptor_for_lambda)  if @event_queue
+								}
+							end
+						when :handler_finished
+							raise  if not @running_handlers[event.descriptor]
+							@running_handlers.delete(event.descriptor)
+							@event_queue << Event.new(action: :handler_start, descriptor: event.descriptor)  if @objects[event.descriptor]
+						when :drop
+							@ffi_events.callback_unregister
+							@objects.values.each { |object| object.do_change(:remove) }
+							while @running_handlers.size > 0
+								event = @event_queue.shift
+								@running_handlers.delete(event.descriptor)  if event.action == :handler_finished
+							end
+							@event_queue.clear
+							@objects.clear
+							@contract.drop
+							@contract, @event_queue = nil, nil
+							break
 						end
-					when :handler_finished
-						raise  if not @running_handlers[event.descriptor]
-						@running_handlers.delete(event.descriptor)
-						@event_queue << Event.new(action: :handler_start, descriptor: event.descriptor)  if @objects[event.descriptor]
-					when :drop
-						@ffi_events.callback_unregister
-						@objects.values.each { |object| object.do_change(:remove) }
-						while @running_handlers.size > 0
-							event = @event_queue.shift
-							@running_handlers.delete(event.descriptor)  if event.action == :handler_finished
-						end
-						@event_queue.clear
-						@objects.clear
-						@contract.drop
-						@contract, @event_queue = nil, nil
-						break
-					end
+					}
 				end
 			}
 		end
 
-		def objects; @objects; end
-		def object; @objects.values.first; end	
+
+		def objects
+			@objects_mutex.synchronize {
+				@objects.dup
+			}
+		end
+
+		
+		def object
+			@objects_mutex.synchronize {
+				@objects.values.first
+			}
+		end	
+
 
 		def drop
 			drop_nonblock
 			async_join(@async)
 		end
 
+
 		def drop_nonblock
 			if @contract
 				@event_queue << Event.new(action: :drop)

data/lib/hakuban/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hakuban
-	VERSION = "0.6.1"
+	VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hakuban
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - yunta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,6 +83,7 @@ files:
 - lib/hakuban.rb
 - lib/hakuban/async.rb
 - lib/hakuban/engine.rb
+- lib/hakuban/event-queue.rb
 - lib/hakuban/ffi.rb
 - lib/hakuban/hakuban.rb
 - lib/hakuban/manager.rb