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/sync.rb: bug fix if obj.initialize has parameters when

Browse source 
obj.extend(Sync_m)

* lib/mutex_m.rb: modified bit


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
keiju 2001-06-06 14:19:33 +00:00
parent b2658a3d83
commit 85d105cf8c
3 changed files with 54 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Jun 6 23:02:36 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/sync.rb: bug fix if obj.initialize has parameters when
obj.extend(Sync_m)
* lib/mutex_m.rb: modified bit
Wed Jun 6 16:11:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_load): should check if tainted even when wrap is

29
lib/mutex_m.rb
View file

@ -25,18 +25,19 @@
#
module Mutex_m
def Mutex_m.define_aliases(cl)
cl.module_eval %q{
alias locked? mu_locked?
alias lock mu_lock
alias unlock mu_unlock
alias try_lock mu_try_lock
alias synchronize mu_synchronize
}
end
def Mutex_m.append_features(cl)
super
unless cl.instance_of?(Module)
cl.module_eval %q{
alias locked? mu_locked?
alias lock mu_lock
alias unlock mu_unlock
alias try_lock mu_try_lock
alias synchronize mu_synchronize
}
end
self
define_aliases(cl) unless cl.instance_of?(Module)
end
def Mutex_m.extend_object(obj)
@ -50,13 +51,7 @@ module Mutex_m
defined? unlock and
defined? try_lock and
defined? synchronize)
eval "class << self
alias locked? mu_locked?
alias lock mu_lock
alias unlock mu_unlock
alias try_lock mu_try_lock
alias synchronize mu_synchronize
end"
Mutex_m.define_aliases(class<<self;self;end)
end
mu_initialize
end

61
lib/sync.rb
View file

@ -1,10 +1,9 @@
#
# sync.rb - 2 phase lock with counter
# $Release Version: 0.2$
# $Release Version: 1.0$
# $Revision$
# $Date$
# by Keiju ISHITSUKA
# modified by matz
# by Keiju ISHITSUKA(keiju@ishitsuka.com)
#
# --
# Sync_m, Synchronizer_m
@ -12,7 +11,7 @@
# obj.extend(Sync_m)
# or
# class Foo
# Sync_m.include_to self
# include Sync_m
# :
# end
#
@ -76,21 +75,25 @@ module Sync_m
end
end
def Sync_m.included(cl)
def Sync_m.define_aliases(cl)
cl.module_eval %q{
alias locked? sync_locked?
alias shared? sync_shared?
alias exclusive? sync_exclusive?
alias lock sync_lock
alias unlock sync_unlock
alias try_lock sync_try_lock
alias synchronize sync_synchronize
}
end
def Sync_m.append_features(cl)
super
unless cl.instance_of?(Module)
# do nothing for Modules
# make aliases and include the proper module.
cl.module_eval %q{
alias locked? sync_locked?
alias shared? sync_shared?
alias exclusive? sync_exclusive?
alias lock sync_lock
alias unlock sync_unlock
alias try_lock sync_try_lock
alias synchronize sync_synchronize
}
define_aliases(cl)
end
return self
end
def Sync_m.extend_object(obj)
@ -106,17 +109,9 @@ module Sync_m
defined? unlock and
defined? try_lock and
defined? synchronize)
eval "class << self
alias locked? sync_locked?
alias shared? sync_shared?
alias exclusive? sync_exclusive?
alias lock sync_lock
alias unlock sync_unlock
alias try_lock sync_try_lock
alias synchronize sync_synchronize
end"
Sync_m.define_aliases(class<<self;self;end)
end
initialize
sync_initialize
end
# accessing
@ -229,8 +224,8 @@ module Sync_m
end
def sync_synchronize(mode = EX)
sync_lock(mode)
begin
sync_lock(mode)
yield
ensure
sync_unlock
@ -238,6 +233,7 @@ module Sync_m
end
attr :sync_mode, true
attr :sync_waiting, true
attr :sync_upgrade_waiting, true
attr :sync_sh_locker, true
@ -246,15 +242,18 @@ module Sync_m
private
def initialize(*args)
ret = super
def sync_initialize
@sync_mode = UN
@sync_waiting = []
@sync_upgrade_waiting = []
@sync_sh_locker = Hash.new
@sync_ex_locker = nil
@sync_ex_count = 0
return ret
end
def initialize(*args)
sync_initialize
super
end
def sync_try_lock_sub(m)
@ -301,12 +300,12 @@ end
Synchronizer_m = Sync_m
class Sync
#Sync_m.extend_class self
include Sync_m
private
def initialize
super
end
end
Synchronizer = Sync