Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
9fc45c1f
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9fc45c1f
编写于
3月 30, 2014
作者:
C
Colin Sherratt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Check that the old value was 1 and not 0 when dropping a Arc value.
Closed #13210.
上级
6bf3fca8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
4 deletion
+38
-4
src/libsync/arc.rs
src/libsync/arc.rs
+38
-4
未找到文件。
src/libsync/arc.rs
浏览文件 @
9fc45c1f
...
...
@@ -165,7 +165,7 @@ fn drop(&mut self) {
// Because `fetch_sub` is already atomic, we do not need to synchronize
// with other threads unless we are going to delete the object. This
// same logic applies to the below `fetch_sub` to the `weak` count.
if
self
.inner
()
.strong
.fetch_sub
(
1
,
atomics
::
Release
)
!=
0
{
return
}
if
self
.inner
()
.strong
.fetch_sub
(
1
,
atomics
::
Release
)
!=
1
{
return
}
// This fence is needed to prevent reordering of use of the data and
// deletion of the data. Because it is marked `Release`, the
...
...
@@ -190,7 +190,7 @@ fn drop(&mut self) {
// allocation itself (there may still be weak pointers lying around).
unsafe
{
drop
(
ptr
::
read
(
&
self
.inner
()
.data
));
}
if
self
.inner
()
.weak
.fetch_sub
(
1
,
atomics
::
Release
)
==
0
{
if
self
.inner
()
.weak
.fetch_sub
(
1
,
atomics
::
Release
)
==
1
{
atomics
::
fence
(
atomics
::
Acquire
);
unsafe
{
global_heap
::
exchange_free
(
self
.x
as
*
u8
)
}
}
...
...
@@ -240,7 +240,7 @@ fn drop(&mut self) {
// If we find out that we were the last weak pointer, then its time to
// deallocate the data entirely. See the discussion in Arc::drop() about
// the memory orderings
if
self
.inner
()
.weak
.fetch_sub
(
1
,
atomics
::
Release
)
==
0
{
if
self
.inner
()
.weak
.fetch_sub
(
1
,
atomics
::
Release
)
==
1
{
atomics
::
fence
(
atomics
::
Acquire
);
unsafe
{
global_heap
::
exchange_free
(
self
.x
as
*
u8
)
}
}
...
...
@@ -251,9 +251,24 @@ fn drop(&mut self) {
#[allow(experimental)]
mod
tests
{
use
super
::{
Arc
,
Weak
};
use
std
::
sync
::
atomics
;
use
std
::
task
;
use
Mutex
;
use
std
::
task
;
struct
Canary
(
*
mut
atomics
::
AtomicUint
);
impl
Drop
for
Canary
{
fn
drop
(
&
mut
self
)
{
unsafe
{
match
*
self
{
Canary
(
c
)
=>
{
(
*
c
)
.fetch_add
(
1
,
atomics
::
SeqCst
);
}
}
}
}
}
#[test]
fn
manually_share_arc
()
{
...
...
@@ -349,4 +364,23 @@ struct Cycle {
// hopefully we don't double-free (or leak)...
}
#[test]
fn
drop_arc
()
{
let
mut
canary
=
atomics
::
AtomicUint
::
new
(
0
);
let
x
=
Arc
::
new
(
Canary
(
&
mut
canary
as
*
mut
atomics
::
AtomicUint
));
drop
(
x
);
assert
!
(
canary
.load
(
atomics
::
Acquire
)
==
1
);
}
#[test]
fn
drop_arc_weak
()
{
let
mut
canary
=
atomics
::
AtomicUint
::
new
(
0
);
let
arc
=
Arc
::
new
(
Canary
(
&
mut
canary
as
*
mut
atomics
::
AtomicUint
));
let
arc_weak
=
arc
.downgrade
();
assert
!
(
canary
.load
(
atomics
::
Acquire
)
==
0
);
drop
(
arc
);
assert
!
(
canary
.load
(
atomics
::
Acquire
)
==
1
);
drop
(
arc_weak
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录