Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix defining object finalizer in Ruby 3.1 to reference a UUID string #74

Merged
merged 8 commits into from
Aug 28, 2023
Merged

Fix defining object finalizer in Ruby 3.1 to reference a UUID string #74

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a8338d
Change how the callback queue is cleared from the finalizer.
vkononov Mar 15, 2022
af3dbe9
Update changelog.
vkononov May 23, 2023
662e45c
Release the finalizer upon callback queue shutdown.
vkononov May 23, 2023
ed87438
Add Github username to changelog.
vkononov May 23, 2023
7350d26
Refactor code.
vkononov Jul 6, 2023
fea78fd
Fix an invalid return variable.
vkononov Aug 8, 2023
a2c3ffe
Change callback queue creation and cleanup methods formatting and vis…
piotrmurach Aug 20, 2023
4953d12
Change the latest entry formatting in the changelog
piotrmurach Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Change Log

### Fixed
* Fix defining object finalizer in Ruby 3.1 to reference a UUID string. by Vadim Kononov(@vkononov)

## [v0.14.0] - 2020-09-12

### Added
Expand Down
17 changes: 12 additions & 5 deletions lib/finite_machine/observer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

require "securerandom"
vkononov marked this conversation as resolved.
Show resolved Hide resolved

require_relative "async_call"
require_relative "callable"
require_relative "hook_event"
Expand All @@ -16,9 +18,10 @@ class Observer < GenericDSL
# Clean up callback queue
#
# @api private
def self.cleanup_callback_queue
def cleanup_callback_queue
proc do
begin
ObjectSpace.undefine_finalizer(@object_id)
if callback_queue.alive?
callback_queue.shutdown
end
Expand All @@ -40,15 +43,19 @@ def self.cleanup_callback_queue
#
# @api public
def initialize(machine)
@machine = machine
@hooks = Hooks.new
@machine = machine
@hooks = Hooks.new
@object_id = nil

@machine.subscribe(self)
ObjectSpace.define_finalizer(self, self.class.cleanup_callback_queue)
end

def callback_queue
@callback_queue ||= MessageQueue.new
return @callback_queue if instance_variable_defined?(:@callback_queue)

@callback_queue = MessageQueue.new
@object_id = SecureRandom.uuid
ObjectSpace.define_finalizer(@object_id, cleanup_callback_queue)
Copy link

@abhishekjain16 abhishekjain16 Aug 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vkononov This method needs to return @callback_queue

      return @callback_queue if instance_variable_defined?(:@callback_queue)

      @callback_queue = MessageQueue.new
      @object_id = SecureRandom.uuid
      ObjectSpace.define_finalizer(@object_id, cleanup_callback_queue)
      @callback_queue

Add @callback_queue to return from this method fixes pipeline

end

# Evaluate in current context
Expand Down