spinlock in BinAllocator

Signed-off-by: smallkirby <ssmallkirby@gmail.com>

ymir/mem/BinAllocator.zig

@@ -2,6 +2,7 @@
 
 const std = @import("std");
 const Allocator = std.mem.Allocator;
+const spin = @import("ymir").spin;
 
 const Self = @This();
 
@@ -28,19 +29,23 @@ comptime {
 page_allocator: Allocator,
 /// Heads of the chunk lists.
 list_heads: [bin_sizes.len]ChunkMetaPointer,
+/// Spin lock.
+lock: spin.SpinLock = spin.SpinLock{},
 
 /// Get a instance of BinAllocator without initialization.
 pub fn newUninit() Self {
     return Self{
         .page_allocator = undefined,
         .list_heads = undefined,
+        .lock = spin.SpinLock{},
     };
 }
 
 /// Initialize the BinAllocator.
 pub fn init(self: *Self, page_allocator: Allocator) void {
     self.page_allocator = page_allocator;
     @memset(self.list_heads[0..self.list_heads.len], null);
+    self.lock = spin.SpinLock{};
 }
 
 /// Get the bin index for the given size.
@@ -55,13 +60,19 @@ fn binIndex(size: usize) ?usize {
 }
 
 fn allocFromBin(self: *Self, bin_index: usize) ?[*]u8 {
+    self.lock.lockDisableIrq();
+    defer self.lock.unlockEnableIrq();
+
     if (self.list_heads[bin_index] == null) {
         initBinPage(self, bin_index) orelse return null;
     }
     return @ptrCast(pop(&self.list_heads[bin_index]));
 }
 
 fn freeToBin(self: *Self, bin_index: usize, ptr: [*]u8) void {
+    self.lock.lockDisableIrq();
+    defer self.lock.unlockEnableIrq();
+
     const chunk: *ChunkMetaNode = @alignCast(@ptrCast(ptr));
     push(&self.list_heads[bin_index], chunk);
 }

ymir/spin.zig

@@ -1,3 +1,5 @@
+const is_test = @import("builtin").is_test;
+
 const ymir = @import("ymir");
 const arch = ymir.arch;
 
@@ -25,7 +27,7 @@ pub const SpinLock = struct {
     /// Must be paired with `unlockEnableIrq()`.
     pub inline fn lockDisableIrq(self: *SpinLock) void {
         self.lock();
-        arch.disableIntr();
+        if (!is_test) arch.disableIntr();
     }
 
     /// Unlock the spin lock.
@@ -43,6 +45,6 @@ pub const SpinLock = struct {
     /// Unlock the spin lock and enable interrupts.
     pub inline fn unlockEnableIrq(self: *SpinLock) void {
         self.unlock();
-        arch.enableIntr();
+        if (!is_test) arch.enableIntr();
     }
 };