gitback/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std.mem.IncrementingAllocator: check for errors

Browse Source
This commit is contained in:
Andrew Kelley 2017-10-15 01:22:36 -04:00
parent 9c44dd7db3
commit 55e8bbd167
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
std/mem.zig
View File

@ -88,6 +88,7 @@ pub const IncrementingAllocator = struct {
allocator: Allocator, allocator: Allocator,
bytes: []u8, bytes: []u8,
end_index: usize, end_index: usize,
heap_handle: if (builtin.os == Os.windows) os.windows.HANDLE else void,
fn init(capacity: usize) -> %IncrementingAllocator { fn init(capacity: usize) -> %IncrementingAllocator {
switch (builtin.os) { switch (builtin.os) {
@ -106,11 +107,12 @@ pub const IncrementingAllocator = struct {
}, },
.bytes = @intToPtr(&u8, addr)[0..capacity], .bytes = @intToPtr(&u8, addr)[0..capacity],
.end_index = 0, .end_index = 0,
.heap_handle = {},
}; };
}, },
Os.windows => { Os.windows => {
const heap_handle = os.windows.GetProcessHeap(); const heap_handle = os.windows.GetProcessHeap() ?? return error.OutOfMemory;
const ptr = os.windows.HeapAlloc(heap_handle, 0, capacity); const ptr = os.windows.HeapAlloc(heap_handle, 0, capacity) ?? return error.OutOfMemory;
return IncrementingAllocator { return IncrementingAllocator {
.allocator = Allocator { .allocator = Allocator {
.allocFn = alloc, .allocFn = alloc,
@ -119,6 +121,7 @@ pub const IncrementingAllocator = struct {
}, },
.bytes = @ptrCast(&u8, ptr)[0..capacity], .bytes = @ptrCast(&u8, ptr)[0..capacity],
.end_index = 0, .end_index = 0,
.heap_handle = heap_handle,
}; };
}, },
else => @compileError("Unsupported OS"), else => @compileError("Unsupported OS"),
@ -131,8 +134,7 @@ pub const IncrementingAllocator = struct {
_ = os.posix.munmap(self.bytes.ptr, self.bytes.len); _ = os.posix.munmap(self.bytes.ptr, self.bytes.len);
}, },
Os.windows => { Os.windows => {
const heap_handle = os.windows.GetProcessHeap(); _ = os.windows.HeapFree(self.heap_handle, 0, @ptrCast(os.windows.LPVOID, self.bytes.ptr));
_ = os.windows.HeapFree(heap_handle, 0, @ptrCast(os.windows.LPVOID, self.bytes.ptr));
}, },
else => @compileError("Unsupported OS"), else => @compileError("Unsupported OS"),
} }