Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-28 20:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove UserSpace abstraction from OSTD

Browse Source
This commit is contained in:
Chen Chengjun
2025-03-17 13:55:53 +08:00
committed by Tate, Hongliang Tian
parent 244a34a2fc
commit 248b24fb4e
10 changed files with 139 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/src/thread/task.rs
View File

@ -1,8 +1,9 @@
// SPDX-License-Identifier: MPL-2.0
use ostd::{
cpu::UserContext,
task::{Task, TaskOptions},
user::{ReturnReason, UserContextApi, UserMode, UserSpace},
user::{ReturnReason, UserContextApi, UserMode},
};
use super::{oops, Thread};
@ -21,7 +22,7 @@ use crate::{
/// create new task with userspace and parent process
pub fn create_new_user_task(
user_space: Arc<UserSpace>,
user_ctx: Arc<UserContext>,
thread_ref: Arc<Thread>,
thread_local: ThreadLocal,
) -> Task {
@ -32,10 +33,10 @@ pub fn create_new_user_task(
let current_thread_local = current_task.as_thread_local().unwrap();
let current_process = current_posix_thread.process();
let user_space = current_task
.user_space()
.expect("user task should have user space");
let mut user_mode = UserMode::new(user_space);
let user_ctx = current_task
.user_ctx()
.expect("user task should have user context");
let mut user_mode = UserMode::new(UserContext::clone(user_ctx));
debug!(
"[Task entry] rip = 0x{:x}",
user_mode.context().instruction_pointer()
@ -67,7 +68,7 @@ pub fn create_new_user_task(
thread_local: current_thread_local,
posix_thread: current_posix_thread,
thread: current_thread.as_ref(),
task: current_task.as_ref(),
task: &current_task,
};
loop {
@ -109,7 +110,7 @@ pub fn create_new_user_task(
})
.data(thread_ref)
.local_data(thread_local)
.user_space(Some(user_space))
.user_ctx(Some(user_ctx))
.build()
.expect("spawn task failed")
}