Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stage1 clear! All applications work but now they are based on threads.

Browse source
This commit is contained in:
Yifan Wu 2021-09-30 14:36:33 -07:00
parent ad0a7bcaa1
commit 4fa4e9cab4
8 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
os/src/task/id.rs
View file

@ -163,15 +163,9 @@ impl TaskUserRes {
);
}
pub fn dealloc_tid(&self) {
let mut process = self.process.inner_exclusive_access();
process.dealloc_tid(self.tid);
}
fn dealloc_user_res(&self) {
// dealloc tid
let mut process = self.process.inner_exclusive_access();
process.dealloc_tid(self.tid);
// dealloc ustack manually
let ustack_bottom_va: VirtAddr = ustack_bottom_from_tid(self.ustack_base, self.tid).into();
process.memory_set.remove_area_with_start_vpn(ustack_bottom_va.into());
@ -180,6 +174,16 @@ impl TaskUserRes {
process.memory_set.remove_area_with_start_vpn(trap_cx_bottom_va.into());
}
#[allow(unused)]
pub fn alloc_tid(&mut self) {
self.tid = self.process.inner_exclusive_access().alloc_tid();
}
pub fn dealloc_tid(&self) {
let mut process = self.process.inner_exclusive_access();
process.dealloc_tid(self.tid);
}
pub fn trap_cx_user_va(&self) -> usize {
trap_cx_bottom_from_tid(self.tid)
}
@ -202,6 +206,7 @@ impl TaskUserRes {
impl Drop for TaskUserRes {
fn drop(&mut self) {
self.dealloc_tid();
self.dealloc_user_res();
// kstack can also be deallocated automatically
}