update allcator

Author: yfblock

Cargo.lock

@@ -0,0 +1,14 @@
+use std::{env, fs, path::PathBuf};
+
+fn main() {
+    let out_dir = PathBuf::from(env::var("OUT_DIR").expect("can't find manifest dir"));
+    let heap_size = env::var("HEAP_SIZE").unwrap_or("0x0180_0000".into());
+    fs::write(
+        out_dir.join("consts.rs"),
+        format!("pub const HEAP_SIZE: usize = {heap_size};"),
+    )
+    .expect("can't write data to temp file in the out_dir");
+
+    println!("cargo:rerun-if-env-changed=HEAP_SIZE");
+    println!("cargo:rerun-if-changed=build.rs");
+}

crates/allocator/build.rs

@@ -5,8 +5,11 @@ extern crate alloc;
 use buddy_system_allocator::LockedHeap;
 use log::info;
 
+include!(concat!(env!("OUT_DIR"), "/consts.rs"));
+
 // 堆大小
-const HEAP_SIZE: usize = 0x0180_0000;
+// const HEAP_SIZE: usize = 0x0180_0000;
+// pub const HEAP_SIZE: usize = 0x0180_0000;
 
 // 堆空间
 #[link_section = ".bss.heap"]
@@ -24,9 +27,10 @@ pub fn init() {
             .init(HEAP.as_mut_ptr() as usize, HEAP_SIZE);
 
         info!(
-            "kernel HEAP init: {:#x} - {:#x}",
+            "kernel HEAP init: {:#x} - {:#x}  size: {:#x}",
             HEAP.as_ptr() as usize,
-            HEAP.as_ptr() as usize + HEAP_SIZE
+            HEAP.as_ptr() as usize + HEAP_SIZE,
+            HEAP_SIZE
         );
     }
 }

crates/allocator/src/lib.rs

@@ -13,7 +13,7 @@ serde = "1.0.136"
 serde_derive = "1.0.136"
 
 [dependencies]
-allocator = { path = "../crates/allocator" }
+allocator = { git = "https://github.com/Byte-OS/allocator.git" }
 crate_interface = { git = "https://github.com/Byte-OS/crate_interface.git" }
 frame_allocator = { git = "https://github.com/Byte-OS/bit_frame_allocator.git" }
 logging = { git = "https://github.com/Byte-OS/logging.git" }