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]

* lib/delegate.rb (Delegator::marshal_load): need to call
  __setobj__.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-12-07 15:15:05 +00:00
parent 1e8e90612a
commit 1f9981df2a
3 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Thu Dec 7 09:29:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/weakref.rb (WeakRef::__setobj__): should support
marshaling. [ruby-talk:228508]
* lib/delegate.rb (Delegator::marshal_load): need to call
__setobj__.
Wed Dec 6 23:56:14 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Dec 6 23:56:14 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

1
lib/delegate.rb
View file

@ -184,6 +184,7 @@ class Delegator
# Reinitializes delegation from a serialized object. # Reinitializes delegation from a serialized object.
def marshal_load(obj) def marshal_load(obj)
initialize_methods(obj) initialize_methods(obj)
__setobj__(obj)
end end
end end

30
lib/weakref.rb
View file

@ -48,18 +48,7 @@ class WeakRef<Delegator
# Create a new WeakRef from +orig+. # Create a new WeakRef from +orig+.
def initialize(orig) def initialize(orig)
super super
@__id = orig.__id__ __setobj__(orig)
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.__id__
@@id_rev_map[self.__id__] = @__id
end end
# Return the object this WeakRef references. Raises RefError if the object # Return the object this WeakRef references. Raises RefError if the object
@ -76,6 +65,23 @@ class WeakRef<Delegator
end end
end end
def __setobj__(obj)
@__id = obj.__id__
__old_status = Thread.critical
begin
Thread.critical = true
unless @@id_rev_map.key?(self)
ObjectSpace.define_finalizer obj, @@final
ObjectSpace.define_finalizer self, @@final
end
@@id_map[@__id] = [] unless @@id_map[@__id]
ensure
Thread.critical = __old_status
end
@@id_map[@__id].push self.__id__
@@id_rev_map[self.__id__] = @__id
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
# been garbage collected. # been garbage collected.
def weakref_alive? def weakref_alive?