From 62bf629f25b896f0c0f801bed3d179dc44466667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9D=E5=80=89=E6=B0=B4=E5=B8=8C?= Date: Wed, 3 Dec 2025 21:47:37 +0800 Subject: [PATCH] refactor: migrate to new arceos branch --- .gitmodules | 2 +- Cargo.lock | 51 +++++++++++++++++++++++----------- Cargo.toml | 24 ++++++---------- Makefile | 2 +- api/Cargo.toml | 4 +-- api/src/file/fs.rs | 8 +++--- api/src/file/mod.rs | 2 +- api/src/syscall/fs/ctl.rs | 2 +- api/src/syscall/fs/fd_ops.rs | 6 ++-- api/src/syscall/fs/io.rs | 2 +- api/src/syscall/fs/memfd.rs | 2 +- api/src/syscall/fs/mount.rs | 2 +- api/src/syscall/fs/stat.rs | 2 +- api/src/syscall/mm/mmap.rs | 2 +- api/src/syscall/signal.rs | 8 +++--- api/src/syscall/sys.rs | 2 +- api/src/syscall/task/clone.rs | 2 +- api/src/syscall/task/execve.rs | 2 +- api/src/task.rs | 3 +- api/src/vfs/dev/fb.rs | 8 +++--- api/src/vfs/dev/loop.rs | 2 +- api/src/vfs/dev/memtrack.rs | 6 ++-- api/src/vfs/mod.rs | 2 +- api/src/vfs/proc.rs | 2 +- arceos | 2 +- core/Cargo.toml | 2 +- core/src/mm.rs | 2 +- core/src/vfs/dev.rs | 2 +- rustfmt.toml | 1 - src/entry.rs | 4 +-- src/main.rs | 2 +- 31 files changed, 86 insertions(+), 77 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8cd4ab82..7706eb67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "arceos"] path = arceos url = https://github.com/Starry-OS/arceos - branch = main + branch = dev diff --git a/Cargo.lock b/Cargo.lock index e70988f8..182d3257 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,6 +185,7 @@ dependencies = [ "log", "memory_addr", "percpu", + "strum", ] [[package]] @@ -386,8 +387,9 @@ dependencies = [ "axbacktrace", "axdisplay", "axdriver", - "axfs-ng", + "axfs", "axhal", + "axinput", "axlog", "axnet", "axruntime", @@ -397,7 +399,7 @@ dependencies = [ ] [[package]] -name = "axfs-ng" +name = "axfs" version = "0.2.0" dependencies = [ "axalloc", @@ -442,20 +444,17 @@ dependencies = [ name = "axhal" version = "0.2.0" dependencies = [ - "aarch64-cpu", "axalloc", "axconfig", "axcpu", - "axlog", "axplat", "axplat-aarch64-qemu-virt", "axplat-loongarch64-qemu-virt", "axplat-riscv64-qemu-virt", "axplat-x86-pc", "cfg-if", - "heapless 0.8.0", + "heapless 0.9.2", "kernel_guard", - "kspin", "lazyinit", "linkme", "log", @@ -499,7 +498,7 @@ dependencies = [ "axalloc", "axconfig", "axerrno 0.2.2", - "axfs-ng", + "axfs", "axfs-ng-vfs", "axhal", "axsync", @@ -522,7 +521,7 @@ dependencies = [ "axconfig", "axdriver", "axerrno 0.2.2", - "axfs-ng", + "axfs", "axfs-ng-vfs", "axhal", "axio", @@ -533,7 +532,7 @@ dependencies = [ "cfg-if", "enum_dispatch", "event-listener", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "lazy_static", "lazyinit", "log", @@ -696,7 +695,7 @@ dependencies = [ "axconfig", "axdisplay", "axdriver", - "axfs-ng", + "axfs", "axhal", "axinput", "axlog", @@ -706,6 +705,7 @@ dependencies = [ "axtask", "chrono", "crate_interface", + "ctor_bare", "indoc", "percpu", ] @@ -750,7 +750,6 @@ dependencies = [ "log", "memory_addr", "percpu", - "weak-map", ] [[package]] @@ -1019,6 +1018,26 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "ctor_bare" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e5ae3c454dc1efb0e5821dc17344539849391b2de18c89596ea563f1909f93" +dependencies = [ + "ctor_bare_macros", +] + +[[package]] +name = "ctor_bare_macros" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49d5cd78b1c748184d41407b14a58af8403c13328ff2b9f49b0a418c24e3ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + [[package]] name = "darling" version = "0.13.4" @@ -2091,7 +2110,7 @@ dependencies = [ "axdriver", "axerrno 0.2.2", "axfeat", - "axfs-ng", + "axfs", "axhal", "axlog", "axplat-riscv64-visionfive2", @@ -2118,7 +2137,7 @@ dependencies = [ "axdriver", "axerrno 0.2.2", "axfeat", - "axfs-ng", + "axfs", "axfs-ng-vfs", "axhal", "axinput", @@ -2137,7 +2156,7 @@ dependencies = [ "event-listener", "flatten_objects", "gimli", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "indoc", "inherit-methods-macro", "kspin", @@ -2169,7 +2188,7 @@ dependencies = [ "axconfig", "axerrno 0.2.2", "axfeat", - "axfs-ng", + "axfs", "axfs-ng-vfs", "axhal", "axio", @@ -2183,7 +2202,7 @@ dependencies = [ "cfg-if", "event-listener", "extern-trait", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "inherit-methods-macro", "kernel-elf-parser", "kernel_guard", diff --git a/Cargo.toml b/Cargo.toml index 5fc71fcd..260506aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,30 +22,30 @@ repository = "https://github.com/arceos-org/starry-next" axfeat = { path = "arceos/api/axfeat", features = [ "alloc-slab", "fp-simd", - "ext4", - "fs", + "fs-ext4", "irq", "multitask", "net", "page-alloc-4g", "rtc", - # "sched-fifo", "sched-rr", + "task-ext", + "uspace", ] } axalloc = { path = "arceos/modules/axalloc" } axconfig = { path = "arceos/modules/axconfig" } axdisplay = { path = "arceos/modules/axdisplay" } axdriver = { path = "arceos/modules/axdriver" } -axfs-ng = { path = "arceos/modules/axfs-ng" } -axhal = { path = "arceos/modules/axhal", features = ["uspace"] } +axfs = { path = "arceos/modules/axfs" } +axhal = { path = "arceos/modules/axhal" } axinput = { path = "arceos/modules/axinput" } axlog = { path = "arceos/modules/axlog" } axmm = { path = "arceos/modules/axmm" } axnet = { path = "arceos/modules/axnet" } axruntime = { path = "arceos/modules/axruntime" } axsync = { path = "arceos/modules/axsync" } -axtask = { path = "arceos/modules/axtask", features = ["task-ext"] } +axtask = { path = "arceos/modules/axtask" } axbacktrace = "0.1" axerrno = "0.2" @@ -57,7 +57,7 @@ bytemuck = { version = "1.23", features = ["unsound_ptr_pod_impl"] } cfg-if = "1.0" event-listener = { version = "5.4.0", default-features = false } extern-trait = "0.2" -hashbrown = "0.15.4" +hashbrown = "0.16" kspin = "0.1" lazy_static = { version = "1.5", features = ["spin_no_std"] } linkme = "0.3.33" @@ -91,16 +91,8 @@ repository.workspace = true [features] default = [] qemu = [ - "axfeat/driver-virtio-blk", - "axfeat/driver-virtio-net", - "axfeat/driver-virtio-socket", - - "axfeat/driver-virtio-gpu", "axfeat/display", - - "axfeat/driver-virtio-input", "axfeat/input", - # "axdriver/dyn", "starry-api/input", "axfeat/vsock", @@ -121,7 +113,7 @@ vf2 = ["dep:axplat-riscv64-visionfive2", "axfeat/driver-sdmmc"] axdriver.workspace = true axerrno.workspace = true axfeat.workspace = true -axfs-ng.workspace = true +axfs.workspace = true axhal.workspace = true axlog.workspace = true axruntime.workspace = true diff --git a/Makefile b/Makefile index ba61b85f..aa69ea93 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Build Options export ARCH := riscv64 export LOG := warn -export BACKTRACE := y +export DWARF := y export MEMTRACK := n # QEMU Options diff --git a/api/Cargo.toml b/api/Cargo.toml index b427bcd7..d9d74f76 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -9,7 +9,7 @@ repository.workspace = true [features] input = ["dep:axinput"] -memtrack = ["axfeat/backtrace", "axalloc/tracking", "dep:gimli"] +memtrack = ["axfeat/dwarf", "axalloc/tracking", "dep:gimli"] vsock = ["axnet/vsock"] dev-log = [] @@ -22,7 +22,7 @@ axdriver.workspace = true axerrno.workspace = true axfeat.workspace = true axfs-ng-vfs.workspace = true -axfs-ng.workspace = true +axfs.workspace = true axhal.workspace = true axinput = { workspace = true, optional = true } axio.workspace = true diff --git a/api/src/file/fs.rs b/api/src/file/fs.rs index 567678a1..9af29020 100644 --- a/api/src/file/fs.rs +++ b/api/src/file/fs.rs @@ -8,7 +8,7 @@ use core::{ }; use axerrno::{AxError, AxResult}; -use axfs_ng::{FS_CONTEXT, FsContext}; +use axfs::{FS_CONTEXT, FsContext}; use axfs_ng_vfs::{Location, Metadata, NodeFlags}; use axpoll::{IoEvents, Pollable}; use axsync::Mutex; @@ -99,19 +99,19 @@ pub fn metadata_to_kstat(metadata: &Metadata) -> Kstat { /// File wrapper for `axfs::fops::File`. pub struct File { - inner: axfs_ng::File, + inner: axfs::File, nonblock: AtomicBool, } impl File { - pub fn new(inner: axfs_ng::File) -> Self { + pub fn new(inner: axfs::File) -> Self { Self { inner, nonblock: AtomicBool::new(false), } } - pub fn inner(&self) -> &axfs_ng::File { + pub fn inner(&self) -> &axfs::File { &self.inner } diff --git a/api/src/file/mod.rs b/api/src/file/mod.rs index 050476f9..f6d6e4e5 100644 --- a/api/src/file/mod.rs +++ b/api/src/file/mod.rs @@ -10,7 +10,7 @@ use alloc::{borrow::Cow, sync::Arc}; use core::{any::Any, ffi::c_int, time::Duration}; use axerrno::{AxError, AxResult}; -use axfs_ng::{FS_CONTEXT, OpenOptions}; +use axfs::{FS_CONTEXT, OpenOptions}; use axfs_ng_vfs::DeviceId; use axio::{Buf, BufMut, Read, Write}; use axpoll::Pollable; diff --git a/api/src/syscall/fs/ctl.rs b/api/src/syscall/fs/ctl.rs index 226955e1..4dac60c1 100644 --- a/api/src/syscall/fs/ctl.rs +++ b/api/src/syscall/fs/ctl.rs @@ -6,7 +6,7 @@ use core::{ }; use axerrno::{AxError, AxResult}; -use axfs_ng::{FS_CONTEXT, FsContext}; +use axfs::{FS_CONTEXT, FsContext}; use axfs_ng_vfs::{MetadataUpdate, NodePermission, NodeType, path::Path}; use axhal::time::wall_time; use axtask::current; diff --git a/api/src/syscall/fs/fd_ops.rs b/api/src/syscall/fs/fd_ops.rs index 556816b4..825ee48b 100644 --- a/api/src/syscall/fs/fd_ops.rs +++ b/api/src/syscall/fs/fd_ops.rs @@ -6,7 +6,7 @@ use core::{ }; use axerrno::{AxError, AxResult}; -use axfs_ng::{FS_CONTEXT, FileBackend, OpenOptions, OpenResult}; +use axfs::{FS_CONTEXT, FileBackend, OpenOptions, OpenResult}; use axfs_ng_vfs::{DirEntry, FileNode, Location, NodePermission, NodeType, Reference}; use axtask::current; use bitflags::bitflags; @@ -77,7 +77,7 @@ fn add_to_fd(result: OpenResult, flags: u32) -> AxResult { Reference::new(Some(pts.entry().clone()), pty_number.to_string()), ); let loc = Location::new(file.location().mountpoint().clone(), entry); - file = axfs_ng::File::new(FileBackend::Direct(loc), file.flags()); + file = axfs::File::new(FileBackend::Direct(loc), file.flags()); } else if inner.is::() { let term = current() .as_thread() @@ -95,7 +95,7 @@ fn add_to_fd(result: OpenResult, flags: u32) -> AxResult { panic!("unknown terminal type") }; let loc = FS_CONTEXT.lock().resolve(&path)?; - file = axfs_ng::File::new(FileBackend::Direct(loc), file.flags()); + file = axfs::File::new(FileBackend::Direct(loc), file.flags()); } } Arc::new(File::new(file)) diff --git a/api/src/syscall/fs/io.rs b/api/src/syscall/fs/io.rs index d360501f..e4c37ce7 100644 --- a/api/src/syscall/fs/io.rs +++ b/api/src/syscall/fs/io.rs @@ -5,7 +5,7 @@ use core::{ }; use axerrno::{AxError, AxResult}; -use axfs_ng::{FS_CONTEXT, FileFlags, OpenOptions}; +use axfs::{FS_CONTEXT, FileFlags, OpenOptions}; use axio::{Seek, SeekFrom}; use axpoll::{IoEvents, Pollable}; use axtask::current; diff --git a/api/src/syscall/fs/memfd.rs b/api/src/syscall/fs/memfd.rs index e0987b40..147a94e2 100644 --- a/api/src/syscall/fs/memfd.rs +++ b/api/src/syscall/fs/memfd.rs @@ -2,7 +2,7 @@ use alloc::format; use core::ffi::c_char; use axerrno::{AxError, AxResult}; -use axfs_ng::{FS_CONTEXT, OpenOptions}; +use axfs::{FS_CONTEXT, OpenOptions}; use linux_raw_sys::general::MFD_CLOEXEC; use crate::{ diff --git a/api/src/syscall/fs/mount.rs b/api/src/syscall/fs/mount.rs index cd8e2303..9efb5c31 100644 --- a/api/src/syscall/fs/mount.rs +++ b/api/src/syscall/fs/mount.rs @@ -1,7 +1,7 @@ use core::ffi::{c_char, c_void}; use axerrno::{AxError, AxResult}; -use axfs_ng::FS_CONTEXT; +use axfs::FS_CONTEXT; use crate::{mm::vm_load_string, vfs::MemoryFs}; diff --git a/api/src/syscall/fs/stat.rs b/api/src/syscall/fs/stat.rs index b9f62cf0..6d773073 100644 --- a/api/src/syscall/fs/stat.rs +++ b/api/src/syscall/fs/stat.rs @@ -1,7 +1,7 @@ use core::ffi::{c_char, c_int}; use axerrno::{AxError, AxResult}; -use axfs_ng::FS_CONTEXT; +use axfs::FS_CONTEXT; use axfs_ng_vfs::{Location, NodePermission}; use linux_raw_sys::general::{ __kernel_fsid_t, AT_EMPTY_PATH, R_OK, W_OK, X_OK, stat, statfs, statx, diff --git a/api/src/syscall/mm/mmap.rs b/api/src/syscall/mm/mmap.rs index 038a48b9..e36f78c7 100644 --- a/api/src/syscall/mm/mmap.rs +++ b/api/src/syscall/mm/mmap.rs @@ -1,7 +1,7 @@ use alloc::sync::Arc; use axerrno::{AxError, AxResult}; -use axfs_ng::FileBackend; +use axfs::FileBackend; use axhal::paging::{MappingFlags, PageSize}; use axmm::backend::{Backend, SharedPages}; use axtask::current; diff --git a/api/src/syscall/signal.rs b/api/src/syscall/signal.rs index 08d83a9f..5f9bfbac 100644 --- a/api/src/syscall/signal.rs +++ b/api/src/syscall/signal.rs @@ -239,14 +239,14 @@ pub fn sys_rt_sigtimedwait( signal.set_blocked(old_blocked & !set); uctx.set_retval(-LinuxError::EINTR.code() as usize); - let fut = poll_fn(|context| { + let fut = poll_fn(|cx| { if let Some(sig) = signal.dequeue_signal(&set) { signal.set_blocked(old_blocked); Poll::Ready(Some(sig)) } else if check_signals(thr, uctx, Some(old_blocked)) { Poll::Ready(None) } else { - curr.on_interrupt(context.waker()); + let _ = curr.poll_interrupt(cx); Poll::Pending } }); @@ -283,11 +283,11 @@ pub fn sys_rt_sigsuspend( uctx.set_retval(-LinuxError::EINTR.code() as usize); - block_on(poll_fn(|context| { + block_on(poll_fn(|cx| { if check_signals(thr, uctx, Some(old_blocked)) { return Poll::Ready(()); } - curr.on_interrupt(context.waker()); + let _ = curr.poll_interrupt(cx); Poll::Pending })); diff --git a/api/src/syscall/sys.rs b/api/src/syscall/sys.rs index a1ebd495..12e3cbba 100644 --- a/api/src/syscall/sys.rs +++ b/api/src/syscall/sys.rs @@ -3,7 +3,7 @@ use core::ffi::c_char; use axconfig::ARCH; use axerrno::{AxError, AxResult}; -use axfs_ng::FS_CONTEXT; +use axfs::FS_CONTEXT; use linux_raw_sys::{ general::{GRND_INSECURE, GRND_NONBLOCK, GRND_RANDOM}, system::{new_utsname, sysinfo}, diff --git a/api/src/syscall/task/clone.rs b/api/src/syscall/task/clone.rs index fc643319..8a567993 100644 --- a/api/src/syscall/task/clone.rs +++ b/api/src/syscall/task/clone.rs @@ -1,7 +1,7 @@ use alloc::sync::Arc; use axerrno::{AxError, AxResult}; -use axfs_ng::FS_CONTEXT; +use axfs::FS_CONTEXT; use axhal::uspace::UserContext; use axtask::{AxTaskExt, current, spawn_task}; use bitflags::bitflags; diff --git a/api/src/syscall/task/execve.rs b/api/src/syscall/task/execve.rs index c45c4200..f61c9915 100644 --- a/api/src/syscall/task/execve.rs +++ b/api/src/syscall/task/execve.rs @@ -2,7 +2,7 @@ use alloc::{string::ToString, sync::Arc, vec::Vec}; use core::ffi::c_char; use axerrno::{AxError, AxResult}; -use axfs_ng::FS_CONTEXT; +use axfs::FS_CONTEXT; use axhal::uspace::UserContext; use axtask::current; use starry_core::{mm::load_user_app, task::AsThread}; diff --git a/api/src/task.rs b/api/src/task.rs index 2408798f..fb680a39 100644 --- a/api/src/task.rs +++ b/api/src/task.rs @@ -90,8 +90,7 @@ pub fn new_user_task( } set_timer_state(&curr, TimerState::User); - // Clear interrupt state - let _ = curr.interrupted(); + curr.clear_interrupt(); } }, name.into(), diff --git a/api/src/vfs/dev/fb.rs b/api/src/vfs/dev/fb.rs index 02191a41..58a74e65 100644 --- a/api/src/vfs/dev/fb.rs +++ b/api/src/vfs/dev/fb.rs @@ -80,7 +80,7 @@ struct FixScreenInfo { async fn refresh_task() { let delay = core::time::Duration::from_secs_f32(1. / 60.); loop { - if let Err(err) = axdisplay::main_display().flush() { + if let Err(err) = axdisplay::framebuffer_flush() { warn!("Failed to refresh framebuffer: {err:?}"); } axtask::future::sleep(delay).await; @@ -97,7 +97,7 @@ impl FrameBuffer { || axtask::future::block_on(refresh_task()), "fb-refresh".into(), ); - let info = axdisplay::main_display().info(); + let info = axdisplay::framebuffer_info(); Self { base: VirtAddr::from(info.fb_base_vaddr), size: info.fb_size, @@ -133,7 +133,7 @@ impl DeviceOps for FrameBuffer { match cmd { // FBIOGET_VSCREENINFO 0x4600 => { - let info = axdisplay::main_display().info(); + let info = axdisplay::framebuffer_info(); let line_length = (info.fb_size / info.height as usize) as u32; let bpp = line_length / info.width; (arg as *mut VarScreenInfo).vm_write(VarScreenInfo { @@ -189,7 +189,7 @@ impl DeviceOps for FrameBuffer { 0x4601 => Ok(0), // FBIOGET_FSCREENINFO 0x4602 => { - let info = axdisplay::main_display().info(); + let info = axdisplay::framebuffer_info(); (arg as *mut FixScreenInfo).vm_write(FixScreenInfo { id: *b"Virtio Framebuf\0", smem_start: info.fb_base_vaddr as u64, diff --git a/api/src/vfs/dev/loop.rs b/api/src/vfs/dev/loop.rs index 808f1ef8..4a85bc76 100644 --- a/api/src/vfs/dev/loop.rs +++ b/api/src/vfs/dev/loop.rs @@ -4,7 +4,7 @@ use core::{ }; use axerrno::{AxError, AxResult, LinuxError}; -use axfs_ng::FileBackend; +use axfs::FileBackend; use axfs_ng_vfs::{DeviceId, NodeFlags, VfsResult}; use axsync::Mutex; use linux_raw_sys::{ diff --git a/api/src/vfs/dev/memtrack.rs b/api/src/vfs/dev/memtrack.rs index c27a81ba..c1b99a2d 100644 --- a/api/src/vfs/dev/memtrack.rs +++ b/api/src/vfs/dev/memtrack.rs @@ -55,11 +55,11 @@ impl MemoryCategory { "starry_process::process_group::ProcessGroup::new" => { return Some("process group"); } - "axfs_ng::fs::ext4::inode::Inode::new" => { + "axfs::fs::ext4::inode::Inode::new" => { return Some("ext4 inode"); } - "axfs_ng::highlevel::file::CachedFile::get_or_create" - | "axfs_ng::highlevel::file::CachedFile::page_or_insert" => { + "axfs::highlevel::file::CachedFile::get_or_create" + | "axfs::highlevel::file::CachedFile::page_or_insert" => { return Some("cached file"); } "axtask::timers::set_alarm_wakeup" => { diff --git a/api/src/vfs/mod.rs b/api/src/vfs/mod.rs index f5e90605..60ffd35a 100644 --- a/api/src/vfs/mod.rs +++ b/api/src/vfs/mod.rs @@ -5,7 +5,7 @@ mod proc; mod tmp; use axerrno::LinuxResult; -use axfs_ng::{FS_CONTEXT, FsContext}; +use axfs::{FS_CONTEXT, FsContext}; use axfs_ng_vfs::{ Filesystem, NodePermission, path::{Path, PathBuf}, diff --git a/api/src/vfs/proc.rs b/api/src/vfs/proc.rs index e859e873..8635d89e 100644 --- a/api/src/vfs/proc.rs +++ b/api/src/vfs/proc.rs @@ -368,7 +368,7 @@ fn builder(fs: Arc) -> DirMaker { "meminfo2", SimpleFile::new_regular(fs.clone(), || { let allocator = axalloc::global_allocator(); - Ok(format!("{:?}\n", allocator.usage_stats())) + Ok(format!("{:?}\n", allocator.usages())) }), ); root.add( diff --git a/arceos b/arceos index c67b5ec7..de4c4550 160000 --- a/arceos +++ b/arceos @@ -1 +1 @@ -Subproject commit c67b5ec714f308e6c7c4883ffb7ff51fe59f46fc +Subproject commit de4c4550d341233d8e0c25b32244e77256e31229 diff --git a/core/Cargo.toml b/core/Cargo.toml index 24f158b0..67a43e1d 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -13,7 +13,7 @@ axconfig.workspace = true axerrno.workspace = true axfeat.workspace = true axfs-ng-vfs.workspace = true -axfs-ng.workspace = true +axfs.workspace = true axhal.workspace = true axio.workspace = true axlog.workspace = true diff --git a/core/src/mm.rs b/core/src/mm.rs index b339b9c7..e27e893e 100644 --- a/core/src/mm.rs +++ b/core/src/mm.rs @@ -10,7 +10,7 @@ use core::{ }; use axerrno::{AxError, AxResult}; -use axfs_ng::{CachedFile, FS_CONTEXT, FileBackend}; +use axfs::{CachedFile, FS_CONTEXT, FileBackend}; use axfs_ng_vfs::Location; use axhal::{ asm::user_copy, diff --git a/core/src/vfs/dev.rs b/core/src/vfs/dev.rs index 9b4de835..7e0fb4ab 100644 --- a/core/src/vfs/dev.rs +++ b/core/src/vfs/dev.rs @@ -1,7 +1,7 @@ use alloc::sync::Arc; use core::{any::Any, task::Context}; -use axfs_ng::CachedFile; +use axfs::CachedFile; use axfs_ng_vfs::{ DeviceId, FileNodeOps, FilesystemOps, Metadata, MetadataUpdate, NodeFlags, NodeOps, NodePermission, NodeType, VfsError, VfsResult, diff --git a/rustfmt.toml b/rustfmt.toml index 9e032131..f3cfd2dd 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -6,7 +6,6 @@ group_imports = "StdExternalCrate" imports_granularity = "Crate" normalize_comments = true -wrap_comments = true reorder_impl_items = true condense_wildcard_suffixes = true diff --git a/src/entry.rs b/src/entry.rs index 2d902291..65a23d52 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -3,7 +3,7 @@ use alloc::{ sync::Arc, }; -use axfs_ng::FS_CONTEXT; +use axfs::FS_CONTEXT; use axhal::uspace::UserContext; use axsync::Mutex; use axtask::{AxTaskExt, spawn_task}; @@ -66,5 +66,5 @@ pub fn run_initproc(args: &[String], envs: &[String]) -> i32 { add_task_to_table(&task); // TODO: wait for all processes to finish - task.join().unwrap() + task.join() } diff --git a/src/main.rs b/src/main.rs index c14b0473..b88237cc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,7 +10,7 @@ extern crate axruntime; use alloc::{borrow::ToOwned, vec::Vec}; -use axfs_ng::FS_CONTEXT; +use axfs::FS_CONTEXT; mod entry;