Merge pull request #2349 from hermit-os/dependabot/cargo/talc-5.0.2

build(deps): upgrade talc to 5

Author: mkroening

Cargo.lock

@@ -316,7 +316,7 @@ shell-words = { version = "1.1", default-features = false }
 simple-shell = { version = "0.0.1", optional = true }
 smallvec = { version = "1", features = ["const_new"] }
 take-static = "0.1"
-talc = { version = "4" }
+talc = { version = "5" }
 thiserror = { version = "2", default-features = false }
 time = { version = "0.3", default-features = false }
 volatile = "0.6"

Cargo.toml

@@ -8,7 +8,8 @@ async fn print_alloc_stats() {
 	future::poll_fn(|cx| {
 		let talc = ALLOCATOR.lock();
 
-		debug!("<alloc-stats>\n{}", talc.get_counters());
+		let counters = talc.counters();
+		debug!("<alloc-stats>\n{counters}");
 
 		cx.waker().wake_by_ref();
 		Poll::<()>::Pending

src/executor/alloc_stats.rs

@@ -52,7 +52,10 @@ use align_address::Align;
 use free_list::{PageLayout, PageRange};
 use hermit_sync::{Lazy, RawInterruptTicketMutex};
 pub use memory_addresses::{PhysAddr, VirtAddr};
-use talc::{ErrOnOom, Span, Talc, Talck};
+#[cfg(target_os = "none")]
+use talc::TalcLock;
+#[cfg(target_os = "none")]
+use talc::source::Manual;
 
 pub use self::page_range_alloc::{PageRangeAllocator, PageRangeBox};
 pub use self::physicalmem::{FrameAlloc, FrameBox};
@@ -65,7 +68,7 @@ use crate::{arch, env};
 
 #[cfg(target_os = "none")]
 #[global_allocator]
-pub(crate) static ALLOCATOR: Talck<RawInterruptTicketMutex, ErrOnOom> = Talc::new(ErrOnOom).lock();
+pub(crate) static ALLOCATOR: TalcLock<RawInterruptTicketMutex, Manual> = TalcLock::new(Manual);
 
 /// Physical and virtual address range of the 2 MiB pages that map the kernel.
 static KERNEL_ADDR_RANGE: Lazy<Range<VirtAddr>> = Lazy::new(|| {
@@ -277,9 +280,12 @@ pub(crate) fn init() {
 
 	let heap_end_addr = map_addr;
 
-	let arena = Span::new(heap_start_addr.as_mut_ptr(), heap_end_addr.as_mut_ptr());
+	let size = heap_end_addr.as_usize() - heap_start_addr.as_usize();
 	unsafe {
-		ALLOCATOR.lock().claim(arena).unwrap();
+		ALLOCATOR
+			.lock()
+			.claim(heap_start_addr.as_mut_ptr(), size)
+			.unwrap();
 	}
 
 	info!("Heap is located at {heap_start_addr:p}..{heap_end_addr:p} ({map_size} Bytes unmapped)");