From 54bd64269bd688b149b7f48f063f0e8cf2704a01 Mon Sep 17 00:00:00 2001 From: Ruihan Li Date: Wed, 30 Apr 2025 20:59:53 +0800 Subject: [PATCH] Rename `systree` to `aster-systree` --- Cargo.lock | 24 ++++++++++++------------ Components.toml | 2 +- kernel/Cargo.toml | 2 +- kernel/comps/systree/Cargo.toml | 2 +- kernel/comps/virtio/Cargo.toml | 2 +- kernel/src/error.rs | 6 +++--- kernel/src/fs/sysfs/fs.rs | 2 +- kernel/src/fs/sysfs/inode.rs | 4 ++-- kernel/src/fs/sysfs/mod.rs | 2 +- kernel/src/fs/sysfs/test.rs | 10 +++++----- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 20e6fffb..29c2eb62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -193,6 +193,7 @@ dependencies = [ "aster-rights", "aster-rights-proc", "aster-softirq", + "aster-systree", "aster-time", "aster-util", "aster-virtio", @@ -223,7 +224,6 @@ dependencies = [ "rand", "riscv", "spin", - "systree", "takeable", "tdx-guest", "time", @@ -262,6 +262,16 @@ dependencies = [ "spin", ] +[[package]] +name = "aster-systree" +version = "0.1.0" +dependencies = [ + "bitflags 2.6.0", + "component", + "ostd", + "spin", +] + [[package]] name = "aster-time" version = "0.1.0" @@ -296,6 +306,7 @@ dependencies = [ "aster-network", "aster-rights", "aster-softirq", + "aster-systree", "aster-util", "bitflags 1.3.2", "component", @@ -304,7 +315,6 @@ dependencies = [ "log", "ostd", "spin", - "systree", "typeflags-util", ] @@ -1687,16 +1697,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "systree" -version = "0.1.0" -dependencies = [ - "bitflags 2.6.0", - "component", - "ostd", - "spin", -] - [[package]] name = "takeable" version = "0.2.2" diff --git a/Components.toml b/Components.toml index a37329aa..48215189 100644 --- a/Components.toml +++ b/Components.toml @@ -11,7 +11,7 @@ time = { name = "aster-time" } framebuffer = { name = "aster-framebuffer" } network = { name = "aster-network" } mlsdisk = { name = "aster-mlsdisk" } -systree = { name = "systree" } +systree = { name = "aster-systree" } [whitelist] [whitelist.nix.main] diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 9ee1789f..f8319450 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -18,6 +18,7 @@ aster-mlsdisk = { path = "comps/mlsdisk" } aster-time = { path = "comps/time" } aster-virtio = { path = "comps/virtio" } aster-rights = { path = "libs/aster-rights" } +aster-systree = { path = "comps/systree" } component = { path = "libs/comp-sys/component" } controlled = { path = "libs/comp-sys/controlled" } osdk-frame-allocator = { path = "../osdk/deps/frame-allocator" } @@ -59,7 +60,6 @@ inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-ma getset = "0.1.2" takeable = "0.2.2" cfg-if = "1.0" -systree = { path = "comps/systree" } # Fixed point numbers # TODO: fork this crate to rewrite all the (unnecessary) unsafe usage fixed = "1.28.0" diff --git a/kernel/comps/systree/Cargo.toml b/kernel/comps/systree/Cargo.toml index 2a4894ec..868259ce 100644 --- a/kernel/comps/systree/Cargo.toml +++ b/kernel/comps/systree/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "systree" +name = "aster-systree" version = "0.1.0" edition = "2021" diff --git a/kernel/comps/virtio/Cargo.toml b/kernel/comps/virtio/Cargo.toml index 34d2160d..4c5fb144 100644 --- a/kernel/comps/virtio/Cargo.toml +++ b/kernel/comps/virtio/Cargo.toml @@ -16,13 +16,13 @@ aster-util = { path = "../../libs/aster-util" } aster-rights = { path = "../../libs/aster-rights" } aster-bigtcp = { path = "../../libs/aster-bigtcp" } aster-softirq = { path = "../softirq"} +aster-systree = { path = "../systree" } id-alloc = { path = "../../../ostd/libs/id-alloc" } typeflags-util = { path = "../../libs/typeflags-util" } ostd = { path = "../../../ostd" } component = { path = "../../libs/comp-sys/component" } log = "0.4" int-to-c-enum = { path = "../../libs/int-to-c-enum" } -systree = { path = "../systree" } [lints] workspace = true diff --git a/kernel/src/error.rs b/kernel/src/error.rs index 7ef9b999..2bb1883b 100644 --- a/kernel/src/error.rs +++ b/kernel/src/error.rs @@ -330,9 +330,9 @@ impl From for Error { } } -impl From for Error { - fn from(err: systree::Error) -> Self { - use systree::Error::*; +impl From for Error { + fn from(err: aster_systree::Error) -> Self { + use aster_systree::Error::*; match err { NodeNotFound(_) => Error::new(Errno::ENOENT), InvalidNodeOperation(_) => Error::new(Errno::EINVAL), diff --git a/kernel/src/fs/sysfs/fs.rs b/kernel/src/fs/sysfs/fs.rs index e2294314..0eb5c01e 100644 --- a/kernel/src/fs/sysfs/fs.rs +++ b/kernel/src/fs/sysfs/fs.rs @@ -2,7 +2,7 @@ use alloc::sync::Arc; -use systree::singleton as systree_singleton; +use aster_systree::singleton as systree_singleton; use crate::fs::{ sysfs::inode::SysFsInode, diff --git a/kernel/src/fs/sysfs/inode.rs b/kernel/src/fs/sysfs/inode.rs index f8194df8..890012a3 100644 --- a/kernel/src/fs/sysfs/inode.rs +++ b/kernel/src/fs/sysfs/inode.rs @@ -8,11 +8,11 @@ use alloc::{ }; use core::time::Duration; -use ostd::sync::RwLock; -use systree::{ +use aster_systree::{ SysAttr, SysAttrFlags, SysBranchNode, SysNode, SysNodeId, SysNodeType, SysObj, SysStr, SysSymlink, SysTree, }; +use ostd::sync::RwLock; use crate::{ events::IoEvents, diff --git a/kernel/src/fs/sysfs/mod.rs b/kernel/src/fs/sysfs/mod.rs index 6afe00c9..2c7d32ba 100644 --- a/kernel/src/fs/sysfs/mod.rs +++ b/kernel/src/fs/sysfs/mod.rs @@ -20,7 +20,7 @@ pub fn singleton() -> &'static Arc { /// Initializes the SysFs singleton. /// Ensures that the singleton is created by calling it. -/// Should be called during kernel filesystem initialization, *after* systree::init(). +/// Should be called during kernel filesystem initialization, *after* aster_systree::init(). pub fn init() { // Ensure systree is initialized first. This should be handled by the kernel's init order. SYSFS_SINGLETON.call_once(|| SysFs::new()); diff --git a/kernel/src/fs/sysfs/test.rs b/kernel/src/fs/sysfs/test.rs index ef45537e..6528b612 100644 --- a/kernel/src/fs/sysfs/test.rs +++ b/kernel/src/fs/sysfs/test.rs @@ -11,16 +11,16 @@ use alloc::{ }; use core::{any::Any, fmt::Debug}; +use aster_systree::{ + init_for_ktest, singleton as systree_singleton, Error as SysTreeError, Result as SysTreeResult, + SysAttrFlags, SysAttrSet, SysAttrSetBuilder, SysBranchNode, SysBranchNodeFields, SysNode, + SysNodeId, SysNodeType, SysNormalNodeFields, SysObj, SysStr, SysSymlink, SysTree, +}; use ostd::{ mm::{FallibleVmRead, FallibleVmWrite, VmReader, VmWriter}, prelude::ktest, sync::RwLock, }; -use systree::{ - init_for_ktest, singleton as systree_singleton, Error as SysTreeError, Result as SysTreeResult, - SysAttrFlags, SysAttrSet, SysAttrSetBuilder, SysBranchNode, SysBranchNodeFields, SysNode, - SysNodeId, SysNodeType, SysNormalNodeFields, SysObj, SysStr, SysSymlink, SysTree, -}; use crate::{ fs::{