File tree Expand file tree Collapse file tree 5 files changed +9
-78
lines changed
java/org/truffleruby/core Expand file tree Collapse file tree 5 files changed +9
-78
lines changed Original file line number Diff line number Diff line change @@ -83,15 +83,15 @@ def abort
83
83
end
84
84
end
85
85
86
- @chan = Truffle :: Channel . new
86
+ @chan = Queue . new
87
87
88
88
def self . watch_channel
89
89
reqs = [ ]
90
90
91
91
loop do
92
92
begin
93
93
while reqs . empty?
94
- req = @chan . receive
94
+ req = @chan . pop
95
95
reqs << req if req
96
96
end
97
97
@@ -101,7 +101,7 @@ def self.watch_channel
101
101
if min . left > 0
102
102
before = Time . now
103
103
104
- new_req = @chan . receive_timeout ( min . left )
104
+ new_req = @chan . pop ( timeout : min . left )
105
105
106
106
slept_for = Time . now - before
107
107
else
Original file line number Diff line number Diff line change 27
27
# The assumption is that this works as expected but is just hard to test.
28
28
29
29
it "will call the finalizer" do
30
- channel = Truffle :: Channel . new
30
+ queue = Queue . new
31
31
finalizer = proc {
32
- channel . send :finalized
32
+ queue << :finalized
33
33
}
34
34
Object . new . tap do |object |
35
35
ObjectSpace . define_finalizer object , finalizer
36
36
ObjectSpace . reachable_objects_from ( object ) . should include ( finalizer )
37
37
end
38
38
Primitive . gc_force
39
39
Truffle ::Debug . drain_finalization_queue # Not needed for correctness
40
- channel . receive_timeout ( TIME_TOLERANCE ) . should == :finalized
40
+ queue . pop ( timeout : TIME_TOLERANCE ) . should == :finalized
41
41
end
42
42
43
43
end
Original file line number Diff line number Diff line change 17
17
# See comment in define_finalizer_spec.rb
18
18
19
19
it "successfully unregisters a finalizer" do
20
- channel = Truffle :: Channel . new
20
+ queue = Queue . new
21
21
Object . new . tap do |object |
22
22
finalizer = proc {
23
- channel . send :finalized
23
+ queue << :finalized
24
24
}
25
25
ObjectSpace . define_finalizer object , finalizer
26
26
ObjectSpace . reachable_objects_from ( object ) . should include ( finalizer )
29
29
end
30
30
Primitive . gc_force
31
31
Truffle ::Debug . drain_finalization_queue # Not needed for correctness
32
- channel . try_receive . should be_nil
32
+ queue . should . empty?
33
33
end
34
34
35
35
end
Original file line number Diff line number Diff line change @@ -946,7 +946,6 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
946
946
"/core/pre.rb" ,
947
947
"/core/basic_object.rb" ,
948
948
"/core/array.rb" ,
949
- "/core/channel.rb" ,
950
949
"/core/configuration.rb" ,
951
950
"/core/false.rb" ,
952
951
"/core/fiber.rb" ,
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments