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

fix bugs

Browse Source
This commit is contained in:
Yu Chen 2022-07-24 16:24:32 +08:00
parent 1e160d0a21
commit 4fde9fb207
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os/src/task/manager.rs
View File

@ -9,8 +9,11 @@ use lazy_static::*;
///A array of `TaskControlBlock` that is thread-safe
#[repr(C)]
pub struct TaskManager {
/// upper_border
pub upper_border:usize,
/// ready_queue
pub ready_queue: VecDeque<Arc<TaskControlBlock>>,
/// lower_border
pub lower_border:usize,
}
@ -33,6 +36,7 @@ impl TaskManager {
self.ready_queue.pop_front()
}
///Get ready_queue_pointer
pub fn get_ready_queue_pointer(&mut self) -> &VecDeque<Arc<TaskControlBlock>> {
&self.ready_queue
}
@ -42,6 +46,9 @@ lazy_static! {
pub static ref TASK_MANAGER: UPSafeCell<TaskManager> =
unsafe { UPSafeCell::new(TaskManager::new()) };
}
static mut TM_RQ:usize=0;
///Interface offered to add task
pub fn add_task(task: Arc<TaskControlBlock>) {
TASK_MANAGER.exclusive_access().add(task);

2
user/src/bin/initproc.rs
View File

@ -4,7 +4,7 @@
#[macro_use]
extern crate user_lib;
use user_lib::{exec, fork, wait, yield_};
use user_lib::{println, getpid, exec, fork, wait, yield_};
#[no_mangle]
fn main() -> i32 {