Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f8167acc
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f8167acc
编写于
2月 02, 2016
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #23398 from matthewd/interlock
Address remaining known issues in Interlock
上级
f3e6e80e
f836630f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
119 addition
and
23 deletion
+119
-23
activesupport/lib/active_support/concurrency/share_lock.rb
activesupport/lib/active_support/concurrency/share_lock.rb
+37
-19
activesupport/lib/active_support/dependencies/interlock.rb
activesupport/lib/active_support/dependencies/interlock.rb
+3
-3
activesupport/test/share_lock_test.rb
activesupport/test/share_lock_test.rb
+78
-0
railties/lib/rails/application/finisher.rb
railties/lib/rails/application/finisher.rb
+1
-1
未找到文件。
activesupport/lib/active_support/concurrency/share_lock.rb
浏览文件 @
f8167acc
...
...
@@ -48,17 +48,11 @@ def initialize
def
start_exclusive
(
purpose:
nil
,
compatible:
[],
no_wait:
false
)
synchronize
do
unless
@exclusive_thread
==
Thread
.
current
if
busy?
(
purpose
)
if
busy
_for_exclusive
?
(
purpose
)
return
false
if
no_wait
loose_shares
=
@sharing
.
delete
(
Thread
.
current
)
@waiting
[
Thread
.
current
]
=
compatible
if
loose_shares
begin
@cv
.
wait_while
{
busy?
(
purpose
)
}
ensure
@waiting
.
delete
Thread
.
current
@sharing
[
Thread
.
current
]
=
loose_shares
if
loose_shares
yield_shares
(
purpose
,
compatible
)
do
@cv
.
wait_while
{
busy_for_exclusive?
(
purpose
)
}
end
end
@exclusive_thread
=
Thread
.
current
...
...
@@ -71,22 +65,26 @@ def start_exclusive(purpose: nil, compatible: [], no_wait: false)
# Relinquish the exclusive lock. Must only be called by the thread
# that called start_exclusive (and currently holds the lock).
def
stop_exclusive
def
stop_exclusive
(
compatible:
[])
synchronize
do
raise
"invalid unlock"
if
@exclusive_thread
!=
Thread
.
current
@exclusive_depth
-=
1
if
@exclusive_depth
==
0
@exclusive_thread
=
nil
@cv
.
broadcast
yield_shares
(
nil
,
compatible
)
do
@cv
.
broadcast
@cv
.
wait_while
{
@exclusive_thread
||
eligible_waiters?
(
compatible
)
}
end
end
end
end
def
start_sharing
def
start_sharing
(
purpose: :share
)
synchronize
do
if
@
exclusive_thread
&&
@exclusive_thread
!=
Thread
.
current
@cv
.
wait_while
{
@exclusive_thread
}
if
@
sharing
[
Thread
.
current
]
==
0
&&
@exclusive_thread
!=
Thread
.
current
&&
busy_for_sharing?
(
purpose
)
@cv
.
wait_while
{
busy_for_sharing?
(
purpose
)
}
end
@sharing
[
Thread
.
current
]
+=
1
end
...
...
@@ -109,12 +107,12 @@ def stop_sharing
# the block.
#
# See +start_exclusive+ for other options.
def
exclusive
(
purpose:
nil
,
compatible:
[],
no_wait:
false
)
def
exclusive
(
purpose:
nil
,
compatible:
[],
after_compatible:
[],
no_wait:
false
)
if
start_exclusive
(
purpose:
purpose
,
compatible:
compatible
,
no_wait:
no_wait
)
begin
yield
ensure
stop_exclusive
stop_exclusive
(
compatible:
after_compatible
)
end
end
end
...
...
@@ -132,11 +130,31 @@ def sharing
private
# Must be called within synchronize
def
busy?
(
purpose
)
(
@exclusive_thread
&&
@exclusive_thread
!=
Thread
.
current
)
||
@waiting
.
any?
{
|
k
,
v
|
k
!=
Thread
.
current
&&
!
v
.
include?
(
purpose
)
}
||
def
busy_for_exclusive?
(
purpose
)
busy_for_sharing?
(
purpose
)
||
@sharing
.
size
>
(
@sharing
[
Thread
.
current
]
>
0
?
1
:
0
)
end
def
busy_for_sharing?
(
purpose
)
(
@exclusive_thread
&&
@exclusive_thread
!=
Thread
.
current
)
||
@waiting
.
any?
{
|
t
,
(
_
,
c
)
|
t
!=
Thread
.
current
&&
!
c
.
include?
(
purpose
)
}
end
def
eligible_waiters?
(
compatible
)
@waiting
.
any?
{
|
t
,
(
p
,
_
)
|
compatible
.
include?
(
p
)
&&
@waiting
.
all?
{
|
t2
,
(
_
,
c2
)
|
t
==
t2
||
c2
.
include?
(
p
)
}
}
end
def
yield_shares
(
purpose
,
compatible
)
loose_shares
=
@sharing
.
delete
(
Thread
.
current
)
@waiting
[
Thread
.
current
]
=
[
purpose
,
compatible
]
if
loose_shares
begin
yield
ensure
@waiting
.
delete
Thread
.
current
@sharing
[
Thread
.
current
]
=
loose_shares
if
loose_shares
end
end
end
end
end
activesupport/lib/active_support/dependencies/interlock.rb
浏览文件 @
f8167acc
...
...
@@ -8,13 +8,13 @@ def initialize # :nodoc:
end
def
loading
@lock
.
exclusive
(
purpose: :load
,
compatible:
[
:load
])
do
@lock
.
exclusive
(
purpose: :load
,
compatible:
[
:load
]
,
after_compatible:
[
:load
]
)
do
yield
end
end
def
unloading
@lock
.
exclusive
(
purpose: :unload
,
compatible:
[
:load
,
:unload
])
do
@lock
.
exclusive
(
purpose: :unload
,
compatible:
[
:load
,
:unload
]
,
after_compatible:
[
:load
,
:unload
]
)
do
yield
end
end
...
...
@@ -24,7 +24,7 @@ def unloading
# concurrent activity, return immediately (without executing the
# block) instead of waiting.
def
attempt_unloading
@lock
.
exclusive
(
purpose: :unload
,
compatible:
[
:load
,
:unload
],
no_wait:
true
)
do
@lock
.
exclusive
(
purpose: :unload
,
compatible:
[
:load
,
:unload
],
after_compatible:
[
:load
,
:unload
],
no_wait:
true
)
do
yield
end
end
...
...
activesupport/test/share_lock_test.rb
浏览文件 @
f8167acc
...
...
@@ -114,14 +114,17 @@ def test_exclusive_conflicting_purpose
[
true
,
false
].
each
do
|
use_upgrading
|
with_thread_waiting_in_lock_section
(
:sharing
)
do
|
sharing_thread_release_latch
|
begin
together
=
Concurrent
::
CyclicBarrier
.
new
(
2
)
conflicting_exclusive_threads
=
[
Thread
.
new
do
@lock
.
send
(
use_upgrading
?
:sharing
:
:tap
)
do
together
.
wait
@lock
.
exclusive
(
purpose: :red
,
compatible:
[
:green
,
:purple
])
{}
end
end
,
Thread
.
new
do
@lock
.
send
(
use_upgrading
?
:sharing
:
:tap
)
do
together
.
wait
@lock
.
exclusive
(
purpose: :blue
,
compatible:
[
:green
])
{}
end
end
...
...
@@ -183,11 +186,14 @@ def test_exclusive_ordering
load_params
=
[
:load
,
[
:load
]]
unload_params
=
[
:unload
,
[
:unload
,
:load
]]
all_sharing
=
Concurrent
::
CyclicBarrier
.
new
(
4
)
[
load_params
,
load_params
,
unload_params
,
unload_params
].
permutation
do
|
thread_params
|
with_thread_waiting_in_lock_section
(
:sharing
)
do
|
sharing_thread_release_latch
|
threads
=
thread_params
.
map
do
|
purpose
,
compatible
|
Thread
.
new
do
@lock
.
sharing
do
all_sharing
.
wait
@lock
.
exclusive
(
purpose:
purpose
,
compatible:
compatible
)
do
scratch_pad_mutex
.
synchronize
{
scratch_pad
<<
purpose
}
end
...
...
@@ -209,6 +215,78 @@ def test_exclusive_ordering
end
end
def
test_new_share_attempts_block_on_waiting_exclusive
with_thread_waiting_in_lock_section
(
:sharing
)
do
|
sharing_thread_release_latch
|
release_exclusive
=
Concurrent
::
CountDownLatch
.
new
waiting_exclusive
=
Thread
.
new
do
@lock
.
sharing
do
@lock
.
exclusive
do
release_exclusive
.
wait
end
end
end
assert_threads_stuck
waiting_exclusive
late_share_attempt
=
Thread
.
new
do
@lock
.
sharing
{}
end
assert_threads_stuck
late_share_attempt
sharing_thread_release_latch
.
count_down
assert_threads_stuck
late_share_attempt
release_exclusive
.
count_down
assert_threads_not_stuck
late_share_attempt
end
end
def
test_share_remains_reentrant_ignoring_a_waiting_exclusive
with_thread_waiting_in_lock_section
(
:sharing
)
do
|
sharing_thread_release_latch
|
ready
=
Concurrent
::
CyclicBarrier
.
new
(
2
)
attempt_reentrancy
=
Concurrent
::
CountDownLatch
.
new
sharer
=
Thread
.
new
do
@lock
.
sharing
do
ready
.
wait
attempt_reentrancy
.
wait
@lock
.
sharing
{}
end
end
exclusive
=
Thread
.
new
do
@lock
.
sharing
do
ready
.
wait
@lock
.
exclusive
{}
end
end
assert_threads_stuck
exclusive
attempt_reentrancy
.
count_down
assert_threads_not_stuck
sharer
assert_threads_stuck
exclusive
end
end
def
test_compatible_exclusives_cooperate_to_both_proceed
ready
=
Concurrent
::
CyclicBarrier
.
new
(
2
)
done
=
Concurrent
::
CyclicBarrier
.
new
(
2
)
threads
=
2
.
times
.
map
do
Thread
.
new
do
@lock
.
sharing
do
ready
.
wait
@lock
.
exclusive
(
purpose: :x
,
compatible:
[
:x
],
after_compatible:
[
:x
])
{}
done
.
wait
end
end
end
assert_threads_not_stuck
threads
end
def
test_in_shared_section_incompatible_non_upgrading_threads_cannot_preempt_upgrading_threads
scratch_pad
=
[]
scratch_pad_mutex
=
Mutex
.
new
...
...
railties/lib/rails/application/finisher.rb
浏览文件 @
f8167acc
...
...
@@ -86,7 +86,7 @@ module Finisher
# added in the hook are taken into account.
initializer
:set_clear_dependencies_hook
,
group: :all
do
callback
=
lambda
do
ActiveSupport
::
Dependencies
.
interlock
.
attempt_
unloading
do
ActiveSupport
::
Dependencies
.
interlock
.
unloading
do
ActiveSupport
::
DescendantsTracker
.
clear
ActiveSupport
::
Dependencies
.
clear
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录