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

Rename get_current_userspace to current_userspace

Browse Source
This commit is contained in:
Ruihan Li
2024-11-14 19:46:20 +08:00
committed by Tate, Hongliang Tian
parent 96de617ad9
commit 39d303c72f
11 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/process/clone.rs
View File

@ -17,8 +17,8 @@ use super::{
};
use crate::{
cpu::LinuxAbi,
current_userspace,
fs::{file_table::FileTable, fs_resolver::FsResolver, utils::FileCreationMask},
get_current_userspace,
prelude::*,
process::posix_thread::allocate_posix_tid,
thread::{AsThread, Tid},
@ -392,7 +392,7 @@ fn clone_parent_settid(
if let Some(addr) =
parent_tidptr.filter(|_| clone_flags.contains(CloneFlags::CLONE_PARENT_SETTID))
{
get_current_userspace!().write_val(addr, &child_tid)?;
current_userspace!().write_val(addr, &child_tid)?;
}
Ok(())
}

4
kernel/src/process/posix_thread/exit.rs
View File

@ -2,7 +2,7 @@
use super::{futex::futex_wake, robust_list::wake_robust_futex, thread_table, PosixThread};
use crate::{
get_current_userspace,
current_userspace,
prelude::*,
process::{do_exit_group, TermStatus},
thread::{Thread, Tid},
@ -25,7 +25,7 @@ pub fn do_exit(thread: &Thread, posix_thread: &PosixThread, term_status: TermSta
// If clear_ctid !=0 ,do a futex wake and write zero to the clear_ctid addr.
if *clear_ctid != 0 {
// FIXME: the correct write length?
if let Err(e) = get_current_userspace!().write_val(*clear_ctid, &0u32) {
if let Err(e) = current_userspace!().write_val(*clear_ctid, &0u32) {
debug!("Ignore error during exit process: {:?}", e);
}
futex_wake(*clear_ctid, 1, None)?;

6
kernel/src/process/posix_thread/robust_list.rs
View File

@ -4,9 +4,7 @@
use ostd::task::Task;
use crate::{
get_current_userspace, prelude::*, process::posix_thread::futex::futex_wake, thread::Tid,
};
use crate::{current_userspace, prelude::*, process::posix_thread::futex::futex_wake, thread::Tid};
#[repr(C)]
#[derive(Clone, Copy, Debug, Pod)]
@ -105,7 +103,7 @@ impl Iterator for FutexIter<'_> {
} else {
None
};
let Ok(robust_list) = get_current_userspace!().read_val::<RobustList>(self.entry_ptr)
let Ok(robust_list) = current_userspace!().read_val::<RobustList>(self.entry_ptr)
else {
return None;
};

4
kernel/src/process/signal/mod.rs
View File

@ -28,7 +28,7 @@ pub use sig_stack::{SigStack, SigStackFlags};
use super::posix_thread::PosixThread;
use crate::{
get_current_userspace,
current_userspace,
prelude::*,
process::{do_exit_group, TermStatus},
};
@ -249,7 +249,7 @@ fn use_alternate_signal_stack(posix_thread: &PosixThread) -> Option<usize> {
fn write_u64_to_user_stack(rsp: u64, value: u64) -> Result<u64> {
let rsp = rsp - 8;
get_current_userspace!().write_val(rsp as Vaddr, &value)?;
current_userspace!().write_val(rsp as Vaddr, &value)?;
Ok(rsp)
}