mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-13 09:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.heap.ArenaAllocator: use singly linked list

Browse Source
This commit is contained in:
daurnimator 2019-05-04 14:02:04 +10:00
parent ddf7942aaa
commit b0648bfbd3
No known key found for this signature in database
GPG Key ID: 45B429A8F9D9D22A
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
std/heap.zig
View File

@ -347,10 +347,10 @@ pub const ArenaAllocator = struct {
pub allocator: Allocator, pub allocator: Allocator,
child_allocator: *Allocator, child_allocator: *Allocator,
buffer_list: std.TailQueue([]u8), buffer_list: std.SinglyLinkedList([]u8),
end_index: usize, end_index: usize,
const BufNode = std.TailQueue([]u8).Node; const BufNode = std.SinglyLinkedList([]u8).Node;
pub fn init(child_allocator: *Allocator) ArenaAllocator { pub fn init(child_allocator: *Allocator) ArenaAllocator {
return ArenaAllocator{ return ArenaAllocator{
@ -359,7 +359,7 @@ pub const ArenaAllocator = struct {
.shrinkFn = shrink, .shrinkFn = shrink,
}, },
.child_allocator = child_allocator, .child_allocator = child_allocator,
.buffer_list = std.TailQueue([]u8).init(), .buffer_list = std.SinglyLinkedList([]u8).init(),
.end_index = 0, .end_index = 0,
}; };
} }
@ -387,10 +387,9 @@ pub const ArenaAllocator = struct {
const buf_node = &buf_node_slice[0]; const buf_node = &buf_node_slice[0];
buf_node.* = BufNode{ buf_node.* = BufNode{
.data = buf, .data = buf,
.prev = null,
.next = null, .next = null,
}; };
self.buffer_list.append(buf_node); self.buffer_list.prepend(buf_node);
self.end_index = 0; self.end_index = 0;
return buf_node; return buf_node;
} }
@ -398,7 +397,7 @@ pub const ArenaAllocator = struct {
fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 { fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
const self = @fieldParentPtr(ArenaAllocator, "allocator", allocator); const self = @fieldParentPtr(ArenaAllocator, "allocator", allocator);
var cur_node = if (self.buffer_list.last) |last_node| last_node else try self.createNode(0, n + alignment); var cur_node = if (self.buffer_list.first) |first_node| first_node else try self.createNode(0, n + alignment);
while (true) { while (true) {
const cur_buf = cur_node.data[@sizeOf(BufNode)..]; const cur_buf = cur_node.data[@sizeOf(BufNode)..];
const addr = @ptrToInt(cur_buf.ptr) + self.end_index; const addr = @ptrToInt(cur_buf.ptr) + self.end_index;