Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
deno
提交
0514f54a
D
deno
项目概览
张重言
/
deno
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
deno
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0514f54a
编写于
10月 06, 2018
作者:
R
Ryan Dahl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make ntasks an atomic counter.
Fixes #919.
上级
f1989c68
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
15 deletion
+13
-15
src/isolate.rs
src/isolate.rs
+13
-15
未找到文件。
src/isolate.rs
浏览文件 @
0514f54a
...
...
@@ -44,7 +44,12 @@ pub struct Isolate {
ptr
:
*
const
libdeno
::
isolate
,
dispatch
:
Dispatch
,
rx
:
mpsc
::
Receiver
<
(
i32
,
Buf
)
>
,
ntasks
:
i32
,
// Although Isolate is only accessed on the main thread, we use an atomic
// variable here to workaround an issue probably caused by our poor usage
// of Box::leak in Isolate::from_c()
// https://github.com/denoland/deno/issues/919
// ntasks ought to be i32.
ntasks
:
atomic
::
AtomicIsize
,
pub
timeout_due
:
Option
<
Instant
>
,
pub
state
:
Arc
<
IsolateState
>
,
}
...
...
@@ -86,7 +91,7 @@ impl Isolate {
ptr
:
0
as
*
const
libdeno
::
isolate
,
dispatch
,
rx
,
ntasks
:
0
,
ntasks
:
atomic
::
AtomicIsize
::
new
(
0
)
,
timeout_due
:
None
,
state
:
Arc
::
new
(
IsolateState
{
dir
:
deno_dir
::
DenoDir
::
new
(
flags
.reload
,
None
)
.unwrap
(),
...
...
@@ -189,25 +194,18 @@ impl Isolate {
}
fn
ntasks_increment
(
&
mut
self
)
{
assert
!
(
self
.ntasks
>=
0
);
self
.ntasks
=
self
.ntasks
+
1
;
let
previous_ntasks
=
self
.ntasks
.fetch_add
(
1
,
atomic
::
Ordering
::
SeqCst
);
assert
!
(
previous_ntasks
>=
0
)
;
}
fn
ntasks_decrement
(
&
mut
self
)
{
// Do something that has no effect. This is done to work around a spooky
// bug that happens in release mode only (presumably a compiler bug), that
// causes nsize to unexpectedly contain zero.
// TODO: remove this workaround when no longer necessary.
#[allow(unused)]
static
UNUSED
:
atomic
::
AtomicIsize
=
atomic
::
AtomicIsize
::
new
(
0
);
UNUSED
.fetch_add
(
self
.ntasks
as
isize
,
atomic
::
Ordering
::
AcqRel
);
// Actually decrement the tasks counter here.
self
.ntasks
=
self
.ntasks
-
1
;
assert
!
(
self
.ntasks
>=
0
);
let
previous_ntasks
=
self
.ntasks
.fetch_sub
(
1
,
atomic
::
Ordering
::
SeqCst
);
assert
!
(
previous_ntasks
>=
1
);
}
fn
is_idle
(
&
self
)
->
bool
{
self
.ntasks
==
0
&&
self
.timeout_due
.is_none
()
let
n
=
self
.ntasks
.load
(
atomic
::
Ordering
::
SeqCst
);
n
==
0
&&
self
.timeout_due
.is_none
()
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录