kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/weakref.rb (WeakRef::__setobj__): should support

Browse source 
marshaling.  [ruby-talk:228508]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-12-07 15:17:14 +00:00
parent e03d9621a6
commit dc859c017d
3 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Dec 7 09:29:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/weakref.rb (WeakRef::__setobj__): should support
marshaling. [ruby-talk:228508]
Wed Dec 6 23:58:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Dec 6 23:58:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, common.mk (NULLCMD): moved for platforms that empty * Makefile.in, common.mk (NULLCMD): moved for platforms that empty

2
lib/delegate.rb
View file

@ -115,7 +115,7 @@
# implementation, see SimpleDelegator. # implementation, see SimpleDelegator.
# #
class Delegator class Delegator
preserved = ["__id__", "object_id", "__send__", "__send", "__send!", "respond_to?", "send", "funcall"] preserved = [:__id__, :object_id, :__send__, :__send, :__send!, :respond_to?, :send, :funcall]
instance_methods.each do |m| instance_methods.each do |m|
next if preserved.include?(m) next if preserved.include?(m)
undef_method m undef_method m

27
lib/weakref.rb
View file

@ -24,7 +24,6 @@ class WeakRef<Delegator
@@id_map = {} # obj -> [ref,...] @@id_map = {} # obj -> [ref,...]
@@id_rev_map = {} # ref -> obj @@id_rev_map = {} # ref -> obj
@@final = lambda {|id| @@final = lambda {|id|
printf "final: %p\n", id
__old_status = Thread.critical __old_status = Thread.critical
Thread.critical = true Thread.critical = true
begin begin
@ -48,19 +47,7 @@ class WeakRef<Delegator
# Create a new WeakRef from +orig+. # Create a new WeakRef from +orig+.
def initialize(orig) def initialize(orig)
@__id = orig.object_id __setobj__(orig)
printf "orig: %p\n", @__id
ObjectSpace.define_finalizer orig, @@final
ObjectSpace.define_finalizer self, @@final
__old_status = Thread.critical
begin
Thread.critical = true
@@id_map[@__id] = [] unless @@id_map[@__id]
ensure
Thread.critical = __old_status
end
@@id_map[@__id].push self.object_id
@@id_rev_map[self.object_id] = @__id
super super
end end
@ -79,6 +66,18 @@ class WeakRef<Delegator
end end
def __setobj__(obj) def __setobj__(obj)
@__id = obj.object_id
ObjectSpace.define_finalizer obj, @@final
ObjectSpace.define_finalizer self, @@final
__old_status = Thread.critical
begin
Thread.critical = true
@@id_map[@__id] = [] unless @@id_map[@__id]
ensure
Thread.critical = __old_status
end
@@id_map[@__id].push self.object_id
@@id_rev_map[self.object_id] = @__id
end end
# Returns true if the referenced object still exists, and false if it has # Returns true if the referenced object still exists, and false if it has