AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-09-11 13:31:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix page sizes (#1184)

Browse Source 
* update VirtualList to new page size API

* Resolve TODO

mprotect needs its slices page-aligned. Since the VirtualList range
is contiguous, using a larger page size wouldn't necessarily reduce
memory anyways. And since pageSize() will only get called when
allocating, it is not particularly expensive.

* replace pageSize() with page_size_max in comptime

* determine maxSizeBytes at runtime

* remove assertion

* add aarch64 linux to CI

* revert CI
This commit is contained in:
archbirdplus 2025-03-09 04:52:13 -07:00 committed by GitHub
parent b5df364ab2
commit 449e9df7e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/utils/list.zig
View File

@ -433,9 +433,11 @@ pub fn ListUnmanaged(comptime T: type) type {
}; };
} }
const pageSize = 4096; const page_size_min = std.heap.page_size_min;
const page_size_max = std.heap.page_size_max;
const pageSize = std.heap.pageSize;
fn reserveMemory(len: usize) [*]align(pageSize) u8 { fn reserveMemory(len: usize) [*]align(page_size_min) u8 {
if(builtin.os.tag == .windows) { if(builtin.os.tag == .windows) {
return @ptrCast(@alignCast(std.os.windows.VirtualAlloc(null, len, std.os.windows.MEM_RESERVE, std.os.windows.PAGE_READWRITE) catch |err| { return @ptrCast(@alignCast(std.os.windows.VirtualAlloc(null, len, std.os.windows.MEM_RESERVE, std.os.windows.PAGE_READWRITE) catch |err| {
std.log.err("Got error while reserving virtual memory of size {}: {s}", .{len, @errorName(err)}); std.log.err("Got error while reserving virtual memory of size {}: {s}", .{len, @errorName(err)});
@ -449,7 +451,7 @@ fn reserveMemory(len: usize) [*]align(pageSize) u8 {
} }
} }
fn commitMemory(start: [*]align(pageSize) u8, len: usize) void { fn commitMemory(start: [*]align(page_size_min) u8, len: usize) void {
if(builtin.os.tag == .windows) { if(builtin.os.tag == .windows) {
_ = std.os.windows.VirtualAlloc(start, len, std.os.windows.MEM_COMMIT, std.os.windows.PAGE_READWRITE) catch |err| { _ = std.os.windows.VirtualAlloc(start, len, std.os.windows.MEM_COMMIT, std.os.windows.PAGE_READWRITE) catch |err| {
std.log.err("Got error while committing virtual memory of size {}: {s}.", .{len, @errorName(err)}); std.log.err("Got error while committing virtual memory of size {}: {s}.", .{len, @errorName(err)});
@ -463,7 +465,7 @@ fn commitMemory(start: [*]align(pageSize) u8, len: usize) void {
} }
} }
fn releaseMemory(start: [*]align(pageSize) u8, len: usize) void { fn releaseMemory(start: [*]align(page_size_min) u8, len: usize) void {
if(builtin.os.tag == .windows) { if(builtin.os.tag == .windows) {
std.os.windows.VirtualFree(start, 0, std.os.windows.MEM_RELEASE); std.os.windows.VirtualFree(start, 0, std.os.windows.MEM_RELEASE);
} else { } else {
@ -474,23 +476,25 @@ fn releaseMemory(start: [*]align(pageSize) u8, len: usize) void {
/// A list that reserves a continuous region of virtual memory without actually committing its pages. /// A list that reserves a continuous region of virtual memory without actually committing its pages.
/// This allows it to grow without ever invalidating pointers. /// This allows it to grow without ever invalidating pointers.
pub fn VirtualList(T: type, maxSize: u32) type { pub fn VirtualList(T: type, maxSize: u32) type {
const maxSizeBytes = std.mem.alignForward(usize, @as(usize, maxSize)*@sizeOf(T), pageSize);
std.debug.assert(@sizeOf(T) <= pageSize);
return struct { return struct {
mem: [*]align(pageSize) T, mem: [*]align(page_size_min) T,
len: u32, len: u32,
committedCapacity: u32, committedCapacity: u32,
fn maxSizeBytes() usize {
return std.mem.alignForward(usize, @as(usize, maxSize)*@sizeOf(T), pageSize());
}
pub fn init() @This() { pub fn init() @This() {
return .{ return .{
.mem = @ptrCast(reserveMemory(maxSizeBytes)), .mem = @ptrCast(reserveMemory(maxSizeBytes())),
.len = 0, .len = 0,
.committedCapacity = 0, .committedCapacity = 0,
}; };
} }
pub fn deinit(self: @This()) void { pub fn deinit(self: @This()) void {
releaseMemory(@ptrCast(self.mem), maxSizeBytes); releaseMemory(@ptrCast(self.mem), maxSizeBytes());
} }
pub fn items(self: *@This()) []T { pub fn items(self: *@This()) []T {
@ -503,10 +507,10 @@ pub fn VirtualList(T: type, maxSize: u32) type {
pub fn ensureCapacity(self: *@This(), newCapacity: usize) void { pub fn ensureCapacity(self: *@This(), newCapacity: usize) void {
if(newCapacity > self.committedCapacity) { if(newCapacity > self.committedCapacity) {
const alignedCapacity = std.mem.alignForward(usize, self.committedCapacity*@sizeOf(T), pageSize); const alignedCapacity = std.mem.alignForward(usize, self.committedCapacity*@sizeOf(T), pageSize());
const newAlignedCapacity = std.mem.alignForward(usize, newCapacity*@sizeOf(T), pageSize); const newAlignedCapacity = std.mem.alignForward(usize, newCapacity*@sizeOf(T), pageSize());
commitMemory(@alignCast(@as([*]align(pageSize) u8, @ptrCast(self.mem))[alignedCapacity..]), newAlignedCapacity - alignedCapacity); commitMemory(@alignCast(@as([*]align(page_size_min) u8, @ptrCast(self.mem))[alignedCapacity..]), newAlignedCapacity - alignedCapacity);
self.committedCapacity = @intCast(newAlignedCapacity/@sizeOf(T)); self.committedCapacity = @intCast(newAlignedCapacity/@sizeOf(T));
} }
} }