refactor: remove lazy_static

Signed-off-by: YdrMaster <[email protected]>

Author: YdrMaster

Cargo.lock

@@ -2,16 +2,14 @@
 name = "ch5"
 version = "0.0.1"
 edition = "2021"
-authors = ["YdrMaster <ydrml@hotmail.com>"]
+authors = ["zflcs <1491657576@qq.com>"]
 
 [dependencies]
 sbi-rt = { git = "https://github.com/rustsbi/sbi-rt", branch = "dev" }
 customizable-buddy = "0.0.2"
 xmas-elf = "0.8.0"
 riscv = "0.8.0"
 spin = "0.9.4"
-lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
-
 
 console = { path = "../console" }
 utils = { path = "../utils" }

ch5/Cargo.toml

@@ -1,31 +1,29 @@
 use alloc::vec::Vec;
-/// 根据应用名加载用户进程
-use lazy_static::*;
+use spin::Lazy;
 
-lazy_static! {
-    static ref APP_NAMES: Vec<&'static str> = {
-        extern "C" {
-            static apps: utils::AppMeta;
-            fn app_names();
-        }
-        let app_num = unsafe { apps.get_app_num() };
-        let mut start = app_names as usize as *const u8;
-        let mut v = Vec::new();
-        unsafe {
-            for _ in 0..app_num {
-                let mut end = start;
-                while end.read_volatile() != b'\0' {
-                    end = end.add(1);
-                }
-                let slice = core::slice::from_raw_parts(start, end as usize - start as usize);
-                let str = core::str::from_utf8(slice).unwrap();
-                v.push(str);
-                start = end.add(1);
+/// 根据应用名加载用户进程
+static APP_NAMES: Lazy<Vec<&'static str>> = Lazy::new(|| {
+    extern "C" {
+        static apps: utils::AppMeta;
+        fn app_names();
+    }
+    let app_num = unsafe { apps.get_app_num() };
+    let mut start = app_names as usize as *const u8;
+    let mut v = Vec::new();
+    unsafe {
+        for _ in 0..app_num {
+            let mut end = start;
+            while end.read_volatile() != b'\0' {
+                end = end.add(1);
             }
+            let slice = core::slice::from_raw_parts(start, end as usize - start as usize);
+            let str = core::str::from_utf8(slice).unwrap();
+            v.push(str);
+            start = end.add(1);
         }
-        v
-    };
-}
+    }
+    v
+});
 
 /// 获取应用程序 elf 数据
 pub fn get_app_data(app_name: &str) -> Option<&'static [u8]> {

ch5/src/loader.rs

@@ -2,15 +2,14 @@
 name = "ch6"
 version = "0.0.1"
 edition = "2021"
-authors = ["YdrMaster <[email protected]>", "tkf2019 <[email protected]>"]
+authors = ["tkf2019 <[email protected]>"]
 
 [dependencies]
+virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "4ee80e5" }
 sbi-rt = { git = "https://github.com/rustsbi/sbi-rt", branch = "dev" }
 customizable-buddy = "0.0.2"
 xmas-elf = "0.8.0"
 riscv = "0.8.0"
-lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
-virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "4ee80e5" }
 spin = "0.7.0"
 
 console = { path = "../console" }
@@ -19,5 +18,4 @@ kernel-context = { path = "../kernel-context" }
 kernel-vm = { path = "../kernel-vm" }
 syscall = { path = "../syscall", features = ["kernel"] }
 task-manage = { path = "../task-manage" }
-
 easy-fs = { path = "../easy-fs" }

ch6/Cargo.toml

@@ -1,7 +1,6 @@
-use alloc::sync::Arc;
-use alloc::{string::String, vec::Vec};
+use alloc::{string::String, sync::Arc, vec::Vec};
 use easy_fs::{EasyFileSystem, FSManager, FileHandle, Inode, OpenFlags};
-use lazy_static::*;
+use spin::Lazy;
 
 use crate::virtio_block::BLOCK_DEVICE;
 
@@ -59,9 +58,7 @@ impl FileSystem {
     }
 }
 
-lazy_static! {
-    pub static ref FS: Arc<FileSystem> = Arc::new(FileSystem::new());
-}
+pub static FS: Lazy<Arc<FileSystem>> = Lazy::new(|| Arc::new(FileSystem::new()));
 
 pub fn read_all(fd: Arc<FileHandle>) -> Vec<u8> {
     let mut offset = 0usize;

ch6/src/fs.rs

@@ -1,13 +1,11 @@
+use crate::{mm::PAGE, KERNEL_SPACE};
 use alloc::sync::Arc;
 use core::{alloc::Layout, ptr::NonNull};
 use easy_fs::BlockDevice;
 use kernel_vm::page_table::{MmuMeta, Sv39, VAddr, VmFlags};
-use lazy_static::*;
-use spin::Mutex;
+use spin::{Lazy, Mutex};
 use virtio_drivers::{Hal, VirtIOBlk, VirtIOHeader};
 
-use crate::{mm::PAGE, KERNEL_SPACE};
-
 const VIRTIO0: usize = 0x10001000;
 
 pub struct VirtIOBlock(Mutex<VirtIOBlk<'static, VirtioHal>>);
@@ -76,6 +74,4 @@ impl Hal for VirtioHal {
     }
 }
 
-lazy_static! {
-    pub static ref BLOCK_DEVICE: Arc<dyn BlockDevice> = Arc::new(VirtIOBlock::new());
-}
+pub static BLOCK_DEVICE: Lazy<Arc<dyn BlockDevice>> = Lazy::new(|| Arc::new(VirtIOBlock::new()));

ch6/src/virtio_block.rs

@@ -8,5 +8,4 @@ edition = "2018"
 
 [dependencies]
 spin = "0.7.0"
-lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
 bitflags = "1.2.1"

easy-fs/Cargo.toml

@@ -1,8 +1,7 @@
 use super::{BlockDevice, BLOCK_SZ};
-use alloc::collections::VecDeque;
-use alloc::sync::Arc;
-use lazy_static::*;
-use spin::Mutex;
+use alloc::{collections::VecDeque, sync::Arc};
+use spin::{Lazy, Mutex};
+
 /// Cached block inside memory
 pub struct BlockCache {
     /// cached block data
@@ -121,11 +120,10 @@ impl BlockCacheManager {
     }
 }
 
-lazy_static! {
-    /// The global block cache manager
-    pub static ref BLOCK_CACHE_MANAGER: Mutex<BlockCacheManager> =
-        Mutex::new(BlockCacheManager::new());
-}
+/// The global block cache manager
+pub static BLOCK_CACHE_MANAGER: Lazy<Mutex<BlockCacheManager>> =
+    Lazy::new(|| Mutex::new(BlockCacheManager::new()));
+
 /// Get the block cache corresponding to the given block id and block device
 pub fn get_block_cache(
     block_id: usize,

easy-fs/src/block_cache.rs

@@ -2,6 +2,7 @@
 name = "task-manage"
 version = "0.1.0"
 edition = "2021"
+authors = ["zflcs <[email protected]>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html