refactor: migrate to new arceos branch (#68)

Author: AsakuraMizu

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "arceos"]
 	path = arceos
 	url = https://github.com/Starry-OS/arceos
-	branch = main
+	branch = dev

Cargo.lock

@@ -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

Cargo.toml

@@ -1,7 +1,7 @@
 # Build Options
 export ARCH := riscv64
 export LOG := warn
-export BACKTRACE := y
+export DWARF := y
 export MEMTRACK := n
 
 # QEMU Options

Makefile

@@ -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

api/Cargo.toml

@@ -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
     }
 

api/src/file/fs.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;

api/src/file/mod.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;

api/src/syscall/fs/ctl.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<i32> {
                         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::<tty::CurrentTty>() {
                     let term = current()
                         .as_thread()
@@ -95,7 +95,7 @@ fn add_to_fd(result: OpenResult, flags: u32) -> AxResult<i32> {
                         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))

api/src/syscall/fs/fd_ops.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;