quentinlegot/burritos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak

Browse Source
This commit is contained in:
Quentin Legot 2023-03-22 14:30:21 +01:00
parent b9c329219a
commit b104bcc6da
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/thread_manager.rs
View File

@ -139,7 +139,7 @@ impl ThreadManager {
pub fn thread_finish(&mut self, machine: &mut Machine, thread: Rc<RefCell<Thread>>) { pub fn thread_finish(&mut self, machine: &mut Machine, thread: Rc<RefCell<Thread>>) {
let old_status = machine.interrupt.set_status(InterruptStatus::InterruptOff); let old_status = machine.interrupt.set_status(InterruptStatus::InterruptOff);
self.g_thread_to_be_destroyed = Option::Some(Rc::clone(&thread)); self.g_thread_to_be_destroyed = Option::Some(Rc::clone(&thread));
self.g_alive.remove(&Rc::clone(&thread)); self.g_alive.remove(Rc::clone(&thread));
// g_objets_addrs->removeObject(self.thread) // a ajouté plus tard // g_objets_addrs->removeObject(self.thread) // a ajouté plus tard
self.thread_sleep(machine, Rc::clone(&thread)); self.thread_sleep(machine, Rc::clone(&thread));
machine.interrupt.set_status(old_status); machine.interrupt.set_status(old_status);

9
src/utility/list.rs
View File

@ -108,13 +108,14 @@ impl<T: PartialEq> List<T> {
/// Return true if the item has been found, otherwise return false /// Return true if the item has been found, otherwise return false
/// ///
/// Worst-case complexity is O(n) /// Worst-case complexity is O(n)
pub fn remove(&mut self, item: &T)-> bool { pub fn remove(&mut self, item: T)-> bool {
unsafe { unsafe {
let mut current: *mut Node<T> = self.head; let mut current: *mut Node<T> = self.head;
let mut previous: *mut Node<T> = ptr::null_mut(); let mut previous: *mut Node<T> = ptr::null_mut();
while !current.is_null() { while !current.is_null() {
if &(*current).elem == item { if (*current).elem == item {
(*previous).next = (*current).next; (*previous).next = (*current).next;
drop(Box::from_raw(current).elem);
return true; return true;
} else { } else {
previous = current; previous = current;
@ -312,11 +313,11 @@ mod test {
list.push(3); list.push(3);
assert_eq!(list.contains(&2), true); assert_eq!(list.contains(&2), true);
list.remove(&2); list.remove(2);
assert_eq!(list.contains(&2), false); assert_eq!(list.contains(&2), false);
assert_eq!(list.pop(), Option::Some(1)); assert_eq!(list.pop(), Option::Some(1));
assert_eq!(list.pop(), Option::Some(3)); assert_eq!(list.pop(), Option::Some(3));
assert_eq!(list.pop(), Option::None); assert_eq!(list.peek(), Option::None);
} }
#[test] #[test]