andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2024-11-24 10:26:25 +04:00
Code Issues Projects Releases Wiki Activity

Replace TCB.inner.block with TCB::acquire_inner_lock

Browse Source
This commit is contained in:
Yifan Wu 2021-02-11 10:25:01 +08:00
parent 00b3e5ff14
commit becf14defa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/src/task/task.rs
View File

@ -98,7 +98,7 @@ impl TaskControlBlock {
.ppn();
// **** hold current PCB lock
let mut inner = self.inner.lock();
let mut inner = self.acquire_inner_lock();
// substitute memory_set
inner.memory_set = memory_set;
// update trap_cx ppn
@ -120,7 +120,7 @@ impl TaskControlBlock {
}
pub fn fork(self: &Arc<TaskControlBlock>) -> Arc<TaskControlBlock> {
// ---- hold parent PCB lock
let mut parent_inner = self.inner.lock();
let mut parent_inner = self.acquire_inner_lock();
// copy user space(include trap context)
let memory_set = MemorySet::from_existed_user(
&parent_inner.memory_set