garentyler/xv6-riscv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move free to assoc. function

Browse Source
This commit is contained in:
Garen Tyler 2023-11-03 18:55:55 -06:00
parent bae37aa507
commit 791b68aaa7
Signed by: garentyler
GPG Key ID: D7A048C454CB7054
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
kernel/rustkernel/src/proc/proc.rs
View File

@ -128,6 +128,28 @@ impl Proc {
unsafe { Some(&mut *p) } unsafe { Some(&mut *p) }
} }
} }
/// Free a proc structure and the data hanging from it, including user pages.
/// self.lock must be held.
pub unsafe fn free(&mut self) {
if !self.trapframe.is_null() {
kfree(self.trapframe.cast());
}
self.trapframe = null_mut();
if !self.pagetable.is_null() {
proc_freepagetable(self.pagetable, self.sz);
}
self.pagetable = null_mut();
self.sz = 0;
self.pid = 0;
self.parent = null_mut();
self.name[0] = 0;
self.chan = null_mut();
self.killed = 0;
self.xstate = 0;
self.state = ProcState::Unused;
}
/// Kill the process with the given pid. /// Kill the process with the given pid.
/// Returns true if the process was killed. /// Returns true if the process was killed.
/// The victim won't exit until it tries to return /// The victim won't exit until it tries to return
@ -150,7 +172,6 @@ impl Proc {
false false
} }
pub fn is_killed(&self) -> bool { pub fn is_killed(&self) -> bool {
let _guard = self.lock.lock(); let _guard = self.lock.lock();
self.killed > 0 self.killed > 0
@ -184,22 +205,7 @@ pub extern "C" fn allocpid() -> i32 {
/// p->lock must be held. /// p->lock must be held.
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn freeproc(p: *mut Proc) { pub unsafe extern "C" fn freeproc(p: *mut Proc) {
if !(*p).trapframe.is_null() { (*p).free();
kfree((*p).trapframe.cast());
}
(*p).trapframe = null_mut();
if !(*p).pagetable.is_null() {
proc_freepagetable((*p).pagetable, (*p).sz);
}
(*p).pagetable = null_mut();
(*p).sz = 0;
(*p).pid = 0;
(*p).parent = null_mut();
(*p).name[0] = 0;
(*p).chan = null_mut();
(*p).killed = 0;
(*p).xstate = 0;
(*p).state = ProcState::Unused;
} }
/// Pass p's abandoned children to init. /// Pass p's abandoned children to init.