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

Fix lock uses in ch5

Browse source
This commit is contained in:
Yifan Wu 2021-02-16 20:50:03 +08:00
parent a15a76edb9
commit 946b37a237
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
os/src/task/processor.rs
View file

@ -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))
}
}