Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
rcore-os
RCore Tutorial V3
提交
1b6f2c4c
R
RCore Tutorial V3
项目概览
rcore-os
/
RCore Tutorial V3
上一次同步 1 年多
通知
15
Star
793
Fork
260
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RCore Tutorial V3
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1b6f2c4c
编写于
2月 16, 2021
作者:
Y
Yifan Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix lock uses in ch5
上级
caac1beb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
22 deletion
+16
-22
os/src/task/mod.rs
os/src/task/mod.rs
+7
-7
os/src/task/processor.rs
os/src/task/processor.rs
+5
-3
os/src/task/task.rs
os/src/task/task.rs
+4
-12
未找到文件。
os/src/task/mod.rs
浏览文件 @
1b6f2c4c
...
...
@@ -28,14 +28,13 @@ pub fn suspend_current_and_run_next() {
// There must be an application running.
let
task
=
take_current_task
()
.unwrap
();
// ---- temporarily hold current PCB lock
let
task_cx_ptr2
=
task
.acquire_inner_lock
()
.get_task_cx_ptr2
();
// ---- release current PCB lock
// ++++ temporarily hold current PCB lock
// ---- hold current PCB lock
let
mut
task_inner
=
task
.acquire_inner_lock
();
let
task_cx_ptr2
=
task_inner
.get_task_cx_ptr2
();
// Change status to Ready
task
.acquire_inner_lock
()
.task_status
=
TaskStatus
::
Ready
;
// ++++ release current PCB lock
task_inner
.task_status
=
TaskStatus
::
Ready
;
drop
(
task_inner
);
// ---- release current PCB lock
// push back to ready queue.
add_task
(
task
);
...
...
@@ -58,6 +57,7 @@ pub fn exit_current_and_run_next(exit_code: i32) {
{
let
mut
initproc_inner
=
INITPROC
.acquire_inner_lock
();
for
child
in
inner
.children
.iter
()
{
child
.acquire_inner_lock
()
.parent
=
Some
(
Arc
::
downgrade
(
&
INITPROC
));
initproc_inner
.children
.push
(
child
.clone
());
}
}
...
...
os/src/task/processor.rs
浏览文件 @
1b6f2c4c
...
...
@@ -35,8 +35,10 @@ impl Processor {
if
let
Some
(
task
)
=
fetch_task
()
{
let
idle_task_cx_ptr2
=
self
.get_idle_task_cx_ptr2
();
// acquire
let
next_task_cx_ptr2
=
task
.acquire_inner_lock
()
.get_task_cx_ptr2
();
task
.acquire_inner_lock
()
.task_status
=
TaskStatus
::
Running
;
let
mut
task_inner
=
task
.acquire_inner_lock
();
let
next_task_cx_ptr2
=
task_inner
.get_task_cx_ptr2
();
task_inner
.task_status
=
TaskStatus
::
Running
;
drop
(
task_inner
);
// release
self
.inner
.borrow_mut
()
.current
=
Some
(
task
);
unsafe
{
...
...
@@ -52,7 +54,7 @@ impl Processor {
self
.inner
.borrow_mut
()
.current
.take
()
}
pub
fn
current
(
&
self
)
->
Option
<
Arc
<
TaskControlBlock
>>
{
self
.inner
.borrow
()
.current
.as_ref
()
.map
(|
task
|
task
.clone
(
))
self
.inner
.borrow
()
.current
.as_ref
()
.map
(|
task
|
Arc
::
clone
(
task
))
}
}
...
...
os/src/task/task.rs
浏览文件 @
1b6f2c4c
...
...
@@ -67,7 +67,6 @@ impl TaskControlBlock {
.translate
(
VirtAddr
::
from
(
TRAP_CONTEXT
)
.into
())
.unwrap
()
.ppn
();
let
task_status
=
TaskStatus
::
Ready
;
// alloc a pid and a kernel stack in kernel space
let
pid_handle
=
pid_alloc
();
let
kernel_stack
=
KernelStack
::
new
(
&
pid_handle
);
...
...
@@ -81,7 +80,7 @@ impl TaskControlBlock {
trap_cx_ppn
,
base_size
:
user_sp
,
task_cx_ptr
:
task_cx_ptr
as
usize
,
task_status
,
task_status
:
TaskStatus
::
Ready
,
memory_set
,
parent
:
None
,
children
:
Vec
::
new
(),
...
...
@@ -97,9 +96,7 @@ impl TaskControlBlock {
}),
};
// prepare TrapContext in user space
// ---- acquire child PCB lock
let
trap_cx
=
task_control_block
.acquire_inner_lock
()
.get_trap_cx
();
// ---- release child PCB lock
*
trap_cx
=
TrapContext
::
app_init_context
(
entry_point
,
user_sp
,
...
...
@@ -123,13 +120,8 @@ impl TaskControlBlock {
inner
.memory_set
=
memory_set
;
// update trap_cx ppn
inner
.trap_cx_ppn
=
trap_cx_ppn
;
drop
(
inner
);
// **** release current PCB lock manually
// initialize trap_cx
// **** acquire current PCB lock
let
trap_cx
=
self
.acquire_inner_lock
()
.get_trap_cx
();
// **** release current PCB lock
let
trap_cx
=
inner
.get_trap_cx
();
*
trap_cx
=
TrapContext
::
app_init_context
(
entry_point
,
user_sp
,
...
...
@@ -137,6 +129,7 @@ impl TaskControlBlock {
self
.kernel_stack
.get_top
(),
trap_handler
as
usize
,
);
// **** release current PCB lock
}
pub
fn
fork
(
self
:
&
Arc
<
TaskControlBlock
>
)
->
Arc
<
TaskControlBlock
>
{
// ---- hold parent PCB lock
...
...
@@ -149,7 +142,6 @@ impl TaskControlBlock {
.translate
(
VirtAddr
::
from
(
TRAP_CONTEXT
)
.into
())
.unwrap
()
.ppn
();
let
task_status
=
TaskStatus
::
Ready
;
// alloc a pid and a kernel stack in kernel space
let
pid_handle
=
pid_alloc
();
let
kernel_stack
=
KernelStack
::
new
(
&
pid_handle
);
...
...
@@ -172,7 +164,7 @@ impl TaskControlBlock {
trap_cx_ppn
,
base_size
:
parent_inner
.base_size
,
task_cx_ptr
:
task_cx_ptr
as
usize
,
task_status
,
task_status
:
TaskStatus
::
Ready
,
memory_set
,
parent
:
Some
(
Arc
::
downgrade
(
self
)),
children
:
Vec
::
new
(),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录