Skip to content

refactor(filesystem): 移除已弃用的wrap方法并使用Arc::new_cyclic重构 #1602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manojks1999 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(filesystem): 移除已弃用的wrap方法并使用Arc::new_cyclic重构 #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 1 addition & 49 deletions kernel/src/filesystem/vfs/mount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
use core::{
any::Any,
fmt::Debug,
hash::Hash,
sync::atomic::{compiler_fence, Ordering},
};
use core::{any::Any, fmt::Debug, hash::Hash};

use alloc::{
collections::BTreeMap,
Expand Down Expand Up @@ -363,26 +358,6 @@ impl MountFS {
self.self_mountpoint.read().as_ref().cloned()
}

/// @brief 用Arc指针包裹MountFS对象。
/// 本函数的主要功能为，初始化MountFS对象中的自引用Weak指针
/// 本函数只应在构造器中被调用
#[allow(dead_code)]
#[deprecated]
fn wrap(self) -> Arc<Self> {
// 创建Arc指针
let mount_fs: Arc<MountFS> = Arc::new(self);
// 创建weak指针
let weak: Weak<MountFS> = Arc::downgrade(&mount_fs);

// 将Arc指针转为Raw指针并对其内部的self_ref字段赋值
let ptr: *mut MountFS = mount_fs.as_ref() as *const Self as *mut Self;
unsafe {
(*ptr).self_ref = weak;
// 返回初始化好的MountFS对象
return mount_fs;
}
}

/// @brief 获取挂载点的文件系统的root inode
pub fn mountpoint_root_inode(&self) -> Arc<MountFSInode> {
return Arc::new_cyclic(|self_ref| MountFSInode {
Expand Down Expand Up @@ -432,29 +407,6 @@ impl Drop for MountFS {
}

impl MountFSInode {
/// @brief 用Arc指针包裹MountFSInode对象。
/// 本函数的主要功能为，初始化MountFSInode对象中的自引用Weak指针
/// 本函数只应在构造器中被调用
#[allow(dead_code)]
#[deprecated]
fn wrap(self) -> Arc<Self> {
// 创建Arc指针
let inode: Arc<MountFSInode> = Arc::new(self);
// 创建Weak指针
let weak: Weak<MountFSInode> = Arc::downgrade(&inode);
// 将Arc指针转为Raw指针并对其内部的self_ref字段赋值
compiler_fence(Ordering::SeqCst);
let ptr: *mut MountFSInode = inode.as_ref() as *const Self as *mut Self;
compiler_fence(Ordering::SeqCst);
unsafe {
(*ptr).self_ref = weak;
compiler_fence(Ordering::SeqCst);

// 返回初始化好的MountFSInode对象
return inode;
}
}

/// @brief 判断当前inode是否为它所在的文件系统的root inode
fn is_mountpoint_root(&self) -> Result<bool, SystemError> {
return Ok(self.inner_inode.fs().root_inode().metadata()?.inode_id
Expand Down
14 changes: 3 additions & 11 deletions kernel/src/process/kthread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,23 +150,15 @@ pub enum KernelThreadCreateStatus {
#[allow(dead_code)]
impl KernelThreadCreateInfo {
pub fn new(func: KernelThreadClosure, name: String) -> Arc<Self> {
let result = Arc::new(Self {
Arc::new_cyclic(|weak_self| Self {
closure: SpinLock::new(Some(Box::new(func))),
name,
created: AtomicKernelThreadCreateStatus::new(KernelThreadCreateStatus::NotCreated),
result_pcb: SpinLock::new(None),
has_unsafe_arc_instance: AtomicBool::new(false),
self_ref: Weak::new(),
self_ref: weak_self.clone(),
to_mark_sleep: AtomicBool::new(true),
});
let tmp = result.clone();
unsafe {
let tmp = Arc::into_raw(tmp) as *mut Self;
(*tmp).self_ref = Arc::downgrade(&result);
Arc::from_raw(tmp);
}

return result;
})
}

/// 创建者调用这函数，等待创建完成后，获取创建结果
Expand Down
Loading