authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-27 18:21:00-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-06-27 18:21:00-04:00
log0cfe8e5d6ff06eed0cde6aed0c009a58ceffc395
treed0dd3f43e534528d5c99ae28506c846a7d9063d0
parent626b5eccab7264e579ce58f56be5fbc3aa42efc4
parenta728436992415d1bce44b0c63938f6443a4e9a11
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #5064 from marler8997/newAllocator

new allocator interface

10 files changed, 610 insertions(+), 457 deletions(-)

lib/std/array_list.zig+2-2
......@@ -219,7 +219,7 @@ pub fn ArrayListAligned(comptime T: type, comptime alignment: ?u29) type {
219219 if (better_capacity >= new_capacity) break;
220220 }
221221
222 const new_memory = try self.allocator.realloc(self.allocatedSlice(), better_capacity);
222 const new_memory = try self.allocator.reallocAtLeast(self.allocatedSlice(), better_capacity);
223223 self.items.ptr = new_memory.ptr;
224224 self.capacity = new_memory.len;
225225 }
......@@ -441,7 +441,7 @@ pub fn ArrayListAlignedUnmanaged(comptime T: type, comptime alignment: ?u29) typ
441441 if (better_capacity >= new_capacity) break;
442442 }
443443
444 const new_memory = try allocator.realloc(self.allocatedSlice(), better_capacity);
444 const new_memory = try allocator.reallocAtLeast(self.allocatedSlice(), better_capacity);
445445 self.items.ptr = new_memory.ptr;
446446 self.capacity = new_memory.len;
447447 }
lib/std/c.zig+11
......@@ -233,6 +233,17 @@ pub extern "c" fn setuid(uid: c_uint) c_int;
233233
234234pub extern "c" fn aligned_alloc(alignment: usize, size: usize) ?*c_void;
235235pub extern "c" fn malloc(usize) ?*c_void;
236
237pub usingnamespace switch (builtin.os.tag) {
238 .linux, .freebsd, .kfreebsd, .netbsd, .openbsd => struct {
239 pub extern "c" fn malloc_usable_size(?*const c_void) usize;
240 },
241 .macosx, .ios, .watchos, .tvos => struct {
242 pub extern "c" fn malloc_size(?*const c_void) usize;
243 },
244 else => struct {},
245};
246
236247pub extern "c" fn realloc(?*c_void, usize) ?*c_void;
237248pub extern "c" fn free(*c_void) void;
238249pub extern "c" fn posix_memalign(memptr: **c_void, alignment: usize, size: usize) c_int;
lib/std/heap.zig+265-319
......@@ -15,23 +15,54 @@ pub const ArenaAllocator = @import("heap/arena_allocator.zig").ArenaAllocator;
1515
1616const Allocator = mem.Allocator;
1717
18usingnamespace if (comptime @hasDecl(c, "malloc_size")) struct {
19 pub const supports_malloc_size = true;
20 pub const malloc_size = c.malloc_size;
21} else if (comptime @hasDecl(c, "malloc_usable_size")) struct {
22 pub const supports_malloc_size = true;
23 pub const malloc_size = c.malloc_usable_size;
24} else struct {
25 pub const supports_malloc_size = false;
26};
27
1828pub const c_allocator = &c_allocator_state;
1929var c_allocator_state = Allocator{
20 .reallocFn = cRealloc,
21 .shrinkFn = cShrink,
30 .allocFn = cAlloc,
31 .resizeFn = cResize,
2232};
2333
24fn cRealloc(self: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
25 assert(new_align <= @alignOf(c_longdouble));
26 const old_ptr = if (old_mem.len == 0) null else @ptrCast(*c_void, old_mem.ptr);
27 const buf = c.realloc(old_ptr, new_size) orelse return error.OutOfMemory;
28 return @ptrCast([*]u8, buf)[0..new_size];
34fn cAlloc(self: *Allocator, len: usize, ptr_align: u29, len_align: u29) Allocator.Error![]u8 {
35 assert(ptr_align <= @alignOf(c_longdouble));
36 const ptr = @ptrCast([*]u8, c.malloc(len) orelse return error.OutOfMemory);
37 if (len_align == 0) {
38 return ptr[0..len];
39 }
40 const full_len = init: {
41 if (supports_malloc_size) {
42 const s = malloc_size(ptr);
43 assert(s >= len);
44 break :init s;
45 }
46 break :init len;
47 };
48 return ptr[0..mem.alignBackwardAnyAlign(full_len, len_align)];
2949}
3050
31fn cShrink(self: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
32 const old_ptr = @ptrCast(*c_void, old_mem.ptr);
33 const buf = c.realloc(old_ptr, new_size) orelse return old_mem[0..new_size];
34 return @ptrCast([*]u8, buf)[0..new_size];
51fn cResize(self: *Allocator, buf: []u8, new_len: usize, len_align: u29) Allocator.Error!usize {
52 if (new_len == 0) {
53 c.free(buf.ptr);
54 return 0;
55 }
56 if (new_len <= buf.len) {
57 return mem.alignAllocLen(buf.len, new_len, len_align);
58 }
59 if (supports_malloc_size) {
60 const full_len = malloc_size(buf.ptr);
61 if (new_len <= full_len) {
62 return mem.alignAllocLen(full_len, new_len, len_align);
63 }
64 }
65 return error.OutOfMemory;
3566}
3667
3768/// This allocator makes a syscall directly for every allocation and free.
......@@ -44,19 +75,27 @@ else
4475 &page_allocator_state;
4576
4677var page_allocator_state = Allocator{
47 .reallocFn = PageAllocator.realloc,
48 .shrinkFn = PageAllocator.shrink,
78 .allocFn = PageAllocator.alloc,
79 .resizeFn = PageAllocator.resize,
4980};
5081var wasm_page_allocator_state = Allocator{
51 .reallocFn = WasmPageAllocator.realloc,
52 .shrinkFn = WasmPageAllocator.shrink,
82 .allocFn = WasmPageAllocator.alloc,
83 .resizeFn = WasmPageAllocator.resize,
5384};
5485
5586pub const direct_allocator = @compileError("deprecated; use std.heap.page_allocator");
5687
88/// Verifies that the adjusted length will still map to the full length
89pub fn alignPageAllocLen(full_len: usize, len: usize, len_align: u29) usize {
90 const aligned_len = mem.alignAllocLen(full_len, len, len_align);
91 assert(mem.alignForward(aligned_len, mem.page_size) == full_len);
92 return aligned_len;
93}
94
5795const PageAllocator = struct {
58 fn alloc(allocator: *Allocator, n: usize, alignment: u29) error{OutOfMemory}![]u8 {
59 if (n == 0) return &[0]u8{};
96 fn alloc(allocator: *Allocator, n: usize, alignment: u29, len_align: u29) error{OutOfMemory}![]u8 {
97 assert(n > 0);
98 const alignedLen = mem.alignForward(n, mem.page_size);
6099
61100 if (builtin.os.tag == .windows) {
62101 const w = os.windows;
......@@ -68,21 +107,21 @@ const PageAllocator = struct {
68107 // see https://devblogs.microsoft.com/oldnewthing/?p=42223
69108 const addr = w.VirtualAlloc(
70109 null,
71 n,
110 alignedLen,
72111 w.MEM_COMMIT | w.MEM_RESERVE,
73112 w.PAGE_READWRITE,
74113 ) catch return error.OutOfMemory;
75114
76115 // If the allocation is sufficiently aligned, use it.
77116 if (@ptrToInt(addr) & (alignment - 1) == 0) {
78 return @ptrCast([*]u8, addr)[0..n];
117 return @ptrCast([*]u8, addr)[0..alignPageAllocLen(alignedLen, n, len_align)];
79118 }
80119
81120 // If it wasn't, actually do an explicitely aligned allocation.
82121 w.VirtualFree(addr, 0, w.MEM_RELEASE);
83 const alloc_size = n + alignment;
122 const alloc_size = n + alignment - mem.page_size;
84123
85 const final_addr = while (true) {
124 while (true) {
86125 // Reserve a range of memory large enough to find a sufficiently
87126 // aligned address.
88127 const reserved_addr = w.VirtualAlloc(
......@@ -102,48 +141,50 @@ const PageAllocator = struct {
102141 // until it succeeds.
103142 const ptr = w.VirtualAlloc(
104143 @intToPtr(*c_void, aligned_addr),
105 n,
144 alignedLen,
106145 w.MEM_COMMIT | w.MEM_RESERVE,
107146 w.PAGE_READWRITE,
108147 ) catch continue;
109148
110 return @ptrCast([*]u8, ptr)[0..n];
111 };
112
113 return @ptrCast([*]u8, final_addr)[0..n];
149 return @ptrCast([*]u8, ptr)[0..alignPageAllocLen(alignedLen, n, len_align)];
150 }
114151 }
115152
116 const alloc_size = if (alignment <= mem.page_size) n else n + alignment;
153 const maxDropLen = alignment - std.math.min(alignment, mem.page_size);
154 const allocLen = if (maxDropLen <= alignedLen - n) alignedLen
155 else mem.alignForward(alignedLen + maxDropLen, mem.page_size);
117156 const slice = os.mmap(
118157 null,
119 mem.alignForward(alloc_size, mem.page_size),
158 allocLen,
120159 os.PROT_READ | os.PROT_WRITE,
121160 os.MAP_PRIVATE | os.MAP_ANONYMOUS,
122161 -1,
123162 0,
124163 ) catch return error.OutOfMemory;
125 if (alloc_size == n) return slice[0..n];
164 assert(mem.isAligned(@ptrToInt(slice.ptr), mem.page_size));
126165
127166 const aligned_addr = mem.alignForward(@ptrToInt(slice.ptr), alignment);
128167
129168 // Unmap the extra bytes that were only requested in order to guarantee
130169 // that the range of memory we were provided had a proper alignment in
131170 // it somewhere. The extra bytes could be at the beginning, or end, or both.
132 const unused_start_len = aligned_addr - @ptrToInt(slice.ptr);
133 if (unused_start_len != 0) {
134 os.munmap(slice[0..unused_start_len]);
171 const dropLen = aligned_addr - @ptrToInt(slice.ptr);
172 if (dropLen != 0) {
173 os.munmap(slice[0..dropLen]);
135174 }
136 const aligned_end_addr = mem.alignForward(aligned_addr + n, mem.page_size);
137 const unused_end_len = @ptrToInt(slice.ptr) + slice.len - aligned_end_addr;
138 if (unused_end_len != 0) {
139 os.munmap(@intToPtr([*]align(mem.page_size) u8, aligned_end_addr)[0..unused_end_len]);
175
176 // Unmap extra pages
177 const alignedBufferLen = allocLen - dropLen;
178 if (alignedBufferLen > alignedLen) {
179 os.munmap(@alignCast(mem.page_size, @intToPtr([*]u8, aligned_addr))[alignedLen..alignedBufferLen]);
140180 }
141181
142 return @intToPtr([*]u8, aligned_addr)[0..n];
182 return @intToPtr([*]u8, aligned_addr)[0..alignPageAllocLen(alignedLen, n, len_align)];
143183 }
144184
145 fn shrink(allocator: *Allocator, old_mem_unaligned: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
146 const old_mem = @alignCast(mem.page_size, old_mem_unaligned);
185 fn resize(allocator: *Allocator, buf_unaligned: []u8, new_size: usize, len_align: u29) Allocator.Error!usize {
186 const new_size_aligned = mem.alignForward(new_size, mem.page_size);
187
147188 if (builtin.os.tag == .windows) {
148189 const w = os.windows;
149190 if (new_size == 0) {
......@@ -153,100 +194,45 @@ const PageAllocator = struct {
153194 // is reserved in the initial allocation call to VirtualAlloc."
154195 // So we can only use MEM_RELEASE when actually releasing the
155196 // whole allocation.
156 w.VirtualFree(old_mem.ptr, 0, w.MEM_RELEASE);
157 } else {
158 const base_addr = @ptrToInt(old_mem.ptr);
159 const old_addr_end = base_addr + old_mem.len;
160 const new_addr_end = base_addr + new_size;
161 const new_addr_end_rounded = mem.alignForward(new_addr_end, mem.page_size);
162 if (old_addr_end > new_addr_end_rounded) {
197 w.VirtualFree(buf_unaligned.ptr, 0, w.MEM_RELEASE);
198 return 0;
199 }
200 if (new_size < buf_unaligned.len) {
201 const base_addr = @ptrToInt(buf_unaligned.ptr);
202 const old_addr_end = base_addr + buf_unaligned.len;
203 const new_addr_end = mem.alignForward(base_addr + new_size, mem.page_size);
204 if (old_addr_end > new_addr_end) {
163205 // For shrinking that is not releasing, we will only
164206 // decommit the pages not needed anymore.
165207 w.VirtualFree(
166 @intToPtr(*c_void, new_addr_end_rounded),
167 old_addr_end - new_addr_end_rounded,
208 @intToPtr(*c_void, new_addr_end),
209 old_addr_end - new_addr_end,
168210 w.MEM_DECOMMIT,
169211 );
170212 }
213 return alignPageAllocLen(new_size_aligned, new_size, len_align);
171214 }
172 return old_mem[0..new_size];
173 }
174 const base_addr = @ptrToInt(old_mem.ptr);
175 const old_addr_end = base_addr + old_mem.len;
176 const new_addr_end = base_addr + new_size;
177 const new_addr_end_rounded = mem.alignForward(new_addr_end, mem.page_size);
178 if (old_addr_end > new_addr_end_rounded) {
179 const ptr = @intToPtr([*]align(mem.page_size) u8, new_addr_end_rounded);
180 os.munmap(ptr[0 .. old_addr_end - new_addr_end_rounded]);
181 }
182 return old_mem[0..new_size];
183 }
184
185 fn realloc(allocator: *Allocator, old_mem_unaligned: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
186 const old_mem = @alignCast(mem.page_size, old_mem_unaligned);
187 if (builtin.os.tag == .windows) {
188 if (old_mem.len == 0) {
189 return alloc(allocator, new_size, new_align);
215 if (new_size == buf_unaligned.len) {
216 return alignPageAllocLen(new_size_aligned, new_size, len_align);
190217 }
218 // new_size > buf_unaligned.len not implemented
219 return error.OutOfMemory;
220 }
191221
192 if (new_size <= old_mem.len and new_align <= old_align) {
193 return shrink(allocator, old_mem, old_align, new_size, new_align);
194 }
195
196 const w = os.windows;
197 const base_addr = @ptrToInt(old_mem.ptr);
198
199 if (new_align > old_align and base_addr & (new_align - 1) != 0) {
200 // Current allocation doesn't satisfy the new alignment.
201 // For now we'll do a new one no matter what, but maybe
202 // there is something smarter to do instead.
203 const result = try alloc(allocator, new_size, new_align);
204 assert(old_mem.len != 0);
205 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
206 w.VirtualFree(old_mem.ptr, 0, w.MEM_RELEASE);
207
208 return result;
209 }
210
211 const old_addr_end = base_addr + old_mem.len;
212 const old_addr_end_rounded = mem.alignForward(old_addr_end, mem.page_size);
213 const new_addr_end = base_addr + new_size;
214 const new_addr_end_rounded = mem.alignForward(new_addr_end, mem.page_size);
215 if (new_addr_end_rounded == old_addr_end_rounded) {
216 // The reallocation fits in the already allocated pages.
217 return @ptrCast([*]u8, old_mem.ptr)[0..new_size];
218 }
219 assert(new_addr_end_rounded > old_addr_end_rounded);
220
221 // We need to commit new pages.
222 const additional_size = new_addr_end - old_addr_end_rounded;
223 const realloc_addr = w.kernel32.VirtualAlloc(
224 @intToPtr(*c_void, old_addr_end_rounded),
225 additional_size,
226 w.MEM_COMMIT | w.MEM_RESERVE,
227 w.PAGE_READWRITE,
228 ) orelse {
229 // Committing new pages at the end of the existing allocation
230 // failed, we need to try a new one.
231 const new_alloc_mem = try alloc(allocator, new_size, new_align);
232 @memcpy(new_alloc_mem.ptr, old_mem.ptr, old_mem.len);
233 w.VirtualFree(old_mem.ptr, 0, w.MEM_RELEASE);
234
235 return new_alloc_mem;
236 };
222 const buf_aligned_len = mem.alignForward(buf_unaligned.len, mem.page_size);
223 if (new_size_aligned == buf_aligned_len)
224 return alignPageAllocLen(new_size_aligned, new_size, len_align);
237225
238 assert(@ptrToInt(realloc_addr) == old_addr_end_rounded);
239 return @ptrCast([*]u8, old_mem.ptr)[0..new_size];
240 }
241 if (new_size <= old_mem.len and new_align <= old_align) {
242 return shrink(allocator, old_mem, old_align, new_size, new_align);
243 }
244 const result = try alloc(allocator, new_size, new_align);
245 if (old_mem.len != 0) {
246 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
247 os.munmap(old_mem);
226 if (new_size_aligned < buf_aligned_len) {
227 const ptr = @intToPtr([*]align(mem.page_size) u8, @ptrToInt(buf_unaligned.ptr) + new_size_aligned);
228 os.munmap(ptr[0 .. buf_aligned_len - new_size_aligned]);
229 if (new_size_aligned == 0)
230 return 0;
231 return alignPageAllocLen(new_size_aligned, new_size, len_align);
248232 }
249 return result;
233
234 // TODO: call mremap
235 return error.OutOfMemory;
250236 }
251237};
252238
......@@ -338,16 +324,24 @@ const WasmPageAllocator = struct {
338324 }
339325
340326 fn nPages(memsize: usize) usize {
341 return std.mem.alignForward(memsize, std.mem.page_size) / std.mem.page_size;
327 return mem.alignForward(memsize, mem.page_size) / mem.page_size;
342328 }
343329
344 fn alloc(allocator: *Allocator, page_count: usize, alignment: u29) error{OutOfMemory}!usize {
345 var idx = conventional.useRecycled(page_count);
346 if (idx != FreeBlock.not_found) {
347 return idx;
330 fn alloc(allocator: *Allocator, len: usize, alignment: u29, len_align: u29) error{OutOfMemory}![]u8 {
331 const page_count = nPages(len);
332 const page_idx = try allocPages(page_count);
333 return @intToPtr([*]u8, page_idx * mem.page_size)
334 [0..alignPageAllocLen(page_count * mem.page_size, len, len_align)];
335 }
336 fn allocPages(page_count: usize) !usize {
337 {
338 const idx = conventional.useRecycled(page_count);
339 if (idx != FreeBlock.not_found) {
340 return idx;
341 }
348342 }
349343
350 idx = extended.useRecycled(page_count);
344 const idx = extended.useRecycled(page_count);
351345 if (idx != FreeBlock.not_found) {
352346 return idx + extendedOffset();
353347 }
......@@ -360,51 +354,36 @@ const WasmPageAllocator = struct {
360354 return @intCast(usize, prev_page_count);
361355 }
362356
363 pub fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) Allocator.Error![]u8 {
364 if (new_align > std.mem.page_size) {
365 return error.OutOfMemory;
357 fn freePages(start: usize, end: usize) void {
358 if (start < extendedOffset()) {
359 conventional.recycle(start, std.math.min(extendedOffset(), end) - start);
366360 }
367
368 if (nPages(new_size) == nPages(old_mem.len)) {
369 return old_mem.ptr[0..new_size];
370 } else if (new_size < old_mem.len) {
371 return shrink(allocator, old_mem, old_align, new_size, new_align);
372 } else {
373 const page_idx = try alloc(allocator, nPages(new_size), new_align);
374 const new_mem = @intToPtr([*]u8, page_idx * std.mem.page_size)[0..new_size];
375 std.mem.copy(u8, new_mem, old_mem);
376 _ = shrink(allocator, old_mem, old_align, 0, 0);
377 return new_mem;
361 if (end > extendedOffset()) {
362 var new_end = end;
363 if (!extended.isInitialized()) {
364 // Steal the last page from the memory currently being recycled
365 // TODO: would it be better if we use the first page instead?
366 new_end -= 1;
367
368 extended.data = @intToPtr([*]u128, new_end * mem.page_size)[0 .. mem.page_size / @sizeOf(u128)];
369 // Since this is the first page being freed and we consume it, assume *nothing* is free.
370 mem.set(u128, extended.data, PageStatus.none_free);
371 }
372 const clamped_start = std.math.max(extendedOffset(), start);
373 extended.recycle(clamped_start - extendedOffset(), new_end - clamped_start);
378374 }
379375 }
380376
381 pub fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
382 @setCold(true);
383 const free_start = nPages(@ptrToInt(old_mem.ptr) + new_size);
384 var free_end = nPages(@ptrToInt(old_mem.ptr) + old_mem.len);
385
386 if (free_end > free_start) {
387 if (free_start < extendedOffset()) {
388 const clamped_end = std.math.min(extendedOffset(), free_end);
389 conventional.recycle(free_start, clamped_end - free_start);
390 }
391
392 if (free_end > extendedOffset()) {
393 if (!extended.isInitialized()) {
394 // Steal the last page from the memory currently being recycled
395 // TODO: would it be better if we use the first page instead?
396 free_end -= 1;
397
398 extended.data = @intToPtr([*]u128, free_end * std.mem.page_size)[0 .. std.mem.page_size / @sizeOf(u128)];
399 // Since this is the first page being freed and we consume it, assume *nothing* is free.
400 std.mem.set(u128, extended.data, PageStatus.none_free);
401 }
402 const clamped_start = std.math.max(extendedOffset(), free_start);
403 extended.recycle(clamped_start - extendedOffset(), free_end - clamped_start);
404 }
377 fn resize(allocator: *Allocator, buf: []u8, new_len: usize, len_align: u29) error{OutOfMemory}!usize {
378 const aligned_len = mem.alignForward(buf.len, mem.page_size);
379 if (new_len > aligned_len) return error.OutOfMemory;
380 const current_n = nPages(aligned_len);
381 const new_n = nPages(new_len);
382 if (new_n != current_n) {
383 const base = nPages(@ptrToInt(buf.ptr));
384 freePages(base + new_n, base + current_n);
405385 }
406
407 return old_mem[0..new_size];
386 return if (new_len == 0) 0 else alignPageAllocLen(new_n * mem.page_size, new_len, len_align);
408387 }
409388};
410389
......@@ -418,8 +397,8 @@ pub const HeapAllocator = switch (builtin.os.tag) {
418397 pub fn init() HeapAllocator {
419398 return HeapAllocator{
420399 .allocator = Allocator{
421 .reallocFn = realloc,
422 .shrinkFn = shrink,
400 .allocFn = alloc,
401 .resizeFn = resize,
423402 },
424403 .heap_handle = null,
425404 };
......@@ -431,11 +410,14 @@ pub const HeapAllocator = switch (builtin.os.tag) {
431410 }
432411 }
433412
434 fn alloc(allocator: *Allocator, n: usize, alignment: u29) error{OutOfMemory}![]u8 {
413 fn getRecordPtr(buf: []u8) *align(1) usize {
414 return @intToPtr(*align(1) usize, @ptrToInt(buf.ptr) + buf.len);
415 }
416
417 fn alloc(allocator: *Allocator, n: usize, ptr_align: u29, len_align: u29) error{OutOfMemory}![]u8 {
435418 const self = @fieldParentPtr(HeapAllocator, "allocator", allocator);
436 if (n == 0) return &[0]u8{};
437419
438 const amt = n + alignment + @sizeOf(usize);
420 const amt = n + ptr_align - 1 + @sizeOf(usize);
439421 const optional_heap_handle = @atomicLoad(?HeapHandle, &self.heap_handle, builtin.AtomicOrder.SeqCst);
440422 const heap_handle = optional_heap_handle orelse blk: {
441423 const options = if (builtin.single_threaded) os.windows.HEAP_NO_SERIALIZE else 0;
......@@ -446,66 +428,60 @@ pub const HeapAllocator = switch (builtin.os.tag) {
446428 };
447429 const ptr = os.windows.kernel32.HeapAlloc(heap_handle, 0, amt) orelse return error.OutOfMemory;
448430 const root_addr = @ptrToInt(ptr);
449 const adjusted_addr = mem.alignForward(root_addr, alignment);
450 const record_addr = adjusted_addr + n;
451 @intToPtr(*align(1) usize, record_addr).* = root_addr;
452 return @intToPtr([*]u8, adjusted_addr)[0..n];
453 }
454
455 fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
456 return realloc(allocator, old_mem, old_align, new_size, new_align) catch {
457 const old_adjusted_addr = @ptrToInt(old_mem.ptr);
458 const old_record_addr = old_adjusted_addr + old_mem.len;
459 const root_addr = @intToPtr(*align(1) usize, old_record_addr).*;
460 const old_ptr = @intToPtr(*c_void, root_addr);
461 const new_record_addr = old_record_addr - new_size + old_mem.len;
462 @intToPtr(*align(1) usize, new_record_addr).* = root_addr;
463 return old_mem[0..new_size];
431 const aligned_addr = mem.alignForward(root_addr, ptr_align);
432 const return_len = init: {
433 if (len_align == 0) break :init n;
434 const full_len = os.windows.kernel32.HeapSize(heap_handle, 0, ptr);
435 assert(full_len != std.math.maxInt(usize));
436 assert(full_len >= amt);
437 break :init mem.alignBackwardAnyAlign(full_len - (aligned_addr - root_addr), len_align);
464438 };
439 const buf = @intToPtr([*]u8, aligned_addr)[0..return_len];
440 getRecordPtr(buf).* = root_addr;
441 return buf;
465442 }
466443
467 fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
468 if (old_mem.len == 0) return alloc(allocator, new_size, new_align);
469
444 fn resize(allocator: *Allocator, buf: []u8, new_size: usize, len_align: u29) error{OutOfMemory}!usize {
470445 const self = @fieldParentPtr(HeapAllocator, "allocator", allocator);
471 const old_adjusted_addr = @ptrToInt(old_mem.ptr);
472 const old_record_addr = old_adjusted_addr + old_mem.len;
473 const root_addr = @intToPtr(*align(1) usize, old_record_addr).*;
474 const old_ptr = @intToPtr(*c_void, root_addr);
475
476446 if (new_size == 0) {
477 os.windows.HeapFree(self.heap_handle.?, 0, old_ptr);
478 return old_mem[0..0];
447 os.windows.HeapFree(self.heap_handle.?, 0, @intToPtr(*c_void ,getRecordPtr(buf).*));
448 return 0;
479449 }
480450
481 const amt = new_size + new_align + @sizeOf(usize);
451 const root_addr = getRecordPtr(buf).*;
452 const align_offset = @ptrToInt(buf.ptr) - root_addr;
453 const amt = align_offset + new_size + @sizeOf(usize);
482454 const new_ptr = os.windows.kernel32.HeapReAlloc(
483455 self.heap_handle.?,
484 0,
485 old_ptr,
456 os.windows.HEAP_REALLOC_IN_PLACE_ONLY,
457 @intToPtr(*c_void, root_addr),
486458 amt,
487459 ) orelse return error.OutOfMemory;
488 const offset = old_adjusted_addr - root_addr;
489 const new_root_addr = @ptrToInt(new_ptr);
490 var new_adjusted_addr = new_root_addr + offset;
491 const offset_is_valid = new_adjusted_addr + new_size + @sizeOf(usize) <= new_root_addr + amt;
492 const offset_is_aligned = new_adjusted_addr % new_align == 0;
493 if (!offset_is_valid or !offset_is_aligned) {
494 // If HeapReAlloc didn't happen to move the memory to the new alignment,
495 // or the memory starting at the old offset would be outside of the new allocation,
496 // then we need to copy the memory to a valid aligned address and use that
497 const new_aligned_addr = mem.alignForward(new_root_addr, new_align);
498 @memcpy(@intToPtr([*]u8, new_aligned_addr), @intToPtr([*]u8, new_adjusted_addr), std.math.min(old_mem.len, new_size));
499 new_adjusted_addr = new_aligned_addr;
500 }
501 const new_record_addr = new_adjusted_addr + new_size;
502 @intToPtr(*align(1) usize, new_record_addr).* = new_root_addr;
503 return @intToPtr([*]u8, new_adjusted_addr)[0..new_size];
460 assert(new_ptr == @intToPtr(*c_void, root_addr));
461 const return_len = init: {
462 if (len_align == 0) break :init new_size;
463 const full_len = os.windows.kernel32.HeapSize(self.heap_handle.?, 0, new_ptr);
464 assert(full_len != std.math.maxInt(usize));
465 assert(full_len >= amt);
466 break :init mem.alignBackwardAnyAlign(full_len - align_offset, len_align);
467 };
468 getRecordPtr(buf.ptr[0..return_len]).* = root_addr;
469 return return_len;
504470 }
505471 },
506472 else => @compileError("Unsupported OS"),
507473};
508474
475fn sliceContainsPtr(container: []u8, ptr: [*]u8) bool {
476 return @ptrToInt(ptr) >= @ptrToInt(container.ptr) and
477 @ptrToInt(ptr) < (@ptrToInt(container.ptr) + container.len);
478}
479
480fn sliceContainsSlice(container: []u8, slice: []u8) bool {
481 return @ptrToInt(slice.ptr) >= @ptrToInt(container.ptr) and
482 (@ptrToInt(slice.ptr) + slice.len) <= (@ptrToInt(container.ptr) + container.len);
483}
484
509485pub const FixedBufferAllocator = struct {
510486 allocator: Allocator,
511487 end_index: usize,
......@@ -514,19 +490,33 @@ pub const FixedBufferAllocator = struct {
514490 pub fn init(buffer: []u8) FixedBufferAllocator {
515491 return FixedBufferAllocator{
516492 .allocator = Allocator{
517 .reallocFn = realloc,
518 .shrinkFn = shrink,
493 .allocFn = alloc,
494 .resizeFn = resize,
519495 },
520496 .buffer = buffer,
521497 .end_index = 0,
522498 };
523499 }
524500
525 fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
501 pub fn ownsPtr(self: *FixedBufferAllocator, ptr: [*]u8) bool {
502 return sliceContainsPtr(self.buffer, ptr);
503 }
504
505 pub fn ownsSlice(self: *FixedBufferAllocator, slice: []u8) bool {
506 return sliceContainsSlice(self.buffer, slice);
507 }
508
509 /// NOTE: this will not work in all cases, if the last allocation had an adjusted_index
510 /// then we won't be able to determine what the last allocation was. This is because
511 /// the alignForward operation done in alloc is not reverisible.
512 pub fn isLastAllocation(self: *FixedBufferAllocator, buf: []u8) bool {
513 return buf.ptr + buf.len == self.buffer.ptr + self.end_index;
514 }
515
516 fn alloc(allocator: *Allocator, n: usize, ptr_align: u29, len_align: u29) ![]u8 {
526517 const self = @fieldParentPtr(FixedBufferAllocator, "allocator", allocator);
527 const addr = @ptrToInt(self.buffer.ptr) + self.end_index;
528 const adjusted_addr = mem.alignForward(addr, alignment);
529 const adjusted_index = self.end_index + (adjusted_addr - addr);
518 const aligned_addr = mem.alignForward(@ptrToInt(self.buffer.ptr) + self.end_index, ptr_align);
519 const adjusted_index = aligned_addr - @ptrToInt(self.buffer.ptr);
530520 const new_end_index = adjusted_index + n;
531521 if (new_end_index > self.buffer.len) {
532522 return error.OutOfMemory;
......@@ -537,30 +527,28 @@ pub const FixedBufferAllocator = struct {
537527 return result;
538528 }
539529
540 fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
530 fn resize(allocator: *Allocator, buf: []u8, new_size: usize, len_align: u29) Allocator.Error!usize {
541531 const self = @fieldParentPtr(FixedBufferAllocator, "allocator", allocator);
542 assert(old_mem.len <= self.end_index);
543 if (old_mem.ptr == self.buffer.ptr + self.end_index - old_mem.len and
544 mem.alignForward(@ptrToInt(old_mem.ptr), new_align) == @ptrToInt(old_mem.ptr))
545 {
546 const start_index = self.end_index - old_mem.len;
547 const new_end_index = start_index + new_size;
548 if (new_end_index > self.buffer.len) return error.OutOfMemory;
549 const result = self.buffer[start_index..new_end_index];
550 self.end_index = new_end_index;
551 return result;
552 } else if (new_size <= old_mem.len and new_align <= old_align) {
553 // We can't do anything with the memory, so tell the client to keep it.
554 return error.OutOfMemory;
555 } else {
556 const result = try alloc(allocator, new_size, new_align);
557 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
558 return result;
532 assert(self.ownsSlice(buf)); // sanity check
533
534 if (!self.isLastAllocation(buf)) {
535 if (new_size > buf.len)
536 return error.OutOfMemory;
537 return if (new_size == 0) 0 else mem.alignAllocLen(buf.len, new_size, len_align);
559538 }
560 }
561539
562 fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
563 return old_mem[0..new_size];
540 if (new_size <= buf.len) {
541 const sub = buf.len - new_size;
542 self.end_index -= sub;
543 return if (new_size == 0) 0 else mem.alignAllocLen(buf.len - sub, new_size, len_align);
544 }
545
546 const add = new_size - buf.len;
547 if (add + self.end_index > self.buffer.len) {
548 return error.OutOfMemory;
549 }
550 self.end_index += add;
551 return new_size;
564552 }
565553
566554 pub fn reset(self: *FixedBufferAllocator) void {
......@@ -581,20 +569,20 @@ pub const ThreadSafeFixedBufferAllocator = blk: {
581569 pub fn init(buffer: []u8) ThreadSafeFixedBufferAllocator {
582570 return ThreadSafeFixedBufferAllocator{
583571 .allocator = Allocator{
584 .reallocFn = realloc,
585 .shrinkFn = shrink,
572 .allocFn = alloc,
573 .resizeFn = Allocator.noResize,
586574 },
587575 .buffer = buffer,
588576 .end_index = 0,
589577 };
590578 }
591579
592 fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
580 fn alloc(allocator: *Allocator, n: usize, ptr_align: u29, len_align: u29) ![]u8 {
593581 const self = @fieldParentPtr(ThreadSafeFixedBufferAllocator, "allocator", allocator);
594582 var end_index = @atomicLoad(usize, &self.end_index, builtin.AtomicOrder.SeqCst);
595583 while (true) {
596584 const addr = @ptrToInt(self.buffer.ptr) + end_index;
597 const adjusted_addr = mem.alignForward(addr, alignment);
585 const adjusted_addr = mem.alignForward(addr, ptr_align);
598586 const adjusted_index = end_index + (adjusted_addr - addr);
599587 const new_end_index = adjusted_index + n;
600588 if (new_end_index > self.buffer.len) {
......@@ -604,21 +592,6 @@ pub const ThreadSafeFixedBufferAllocator = blk: {
604592 }
605593 }
606594
607 fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
608 if (new_size <= old_mem.len and new_align <= old_align) {
609 // We can't do anything useful with the memory, tell the client to keep it.
610 return error.OutOfMemory;
611 } else {
612 const result = try alloc(allocator, new_size, new_align);
613 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
614 return result;
615 }
616 }
617
618 fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
619 return old_mem[0..new_size];
620 }
621
622595 pub fn reset(self: *ThreadSafeFixedBufferAllocator) void {
623596 self.end_index = 0;
624597 }
......@@ -632,8 +605,8 @@ pub fn stackFallback(comptime size: usize, fallback_allocator: *Allocator) Stack
632605 .fallback_allocator = fallback_allocator,
633606 .fixed_buffer_allocator = undefined,
634607 .allocator = Allocator{
635 .reallocFn = StackFallbackAllocator(size).realloc,
636 .shrinkFn = StackFallbackAllocator(size).shrink,
608 .allocFn = StackFallbackAllocator(size).realloc,
609 .resizeFn = StackFallbackAllocator(size).resize,
637610 },
638611 };
639612}
......@@ -652,58 +625,19 @@ pub fn StackFallbackAllocator(comptime size: usize) type {
652625 return &self.allocator;
653626 }
654627
655 fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
628 fn alloc(allocator: *Allocator, len: usize, ptr_align: u29, len_align: u29) error{OutOfMemory}![*]u8 {
656629 const self = @fieldParentPtr(Self, "allocator", allocator);
657 const in_buffer = @ptrToInt(old_mem.ptr) >= @ptrToInt(&self.buffer) and
658 @ptrToInt(old_mem.ptr) < @ptrToInt(&self.buffer) + self.buffer.len;
659 if (in_buffer) {
660 return FixedBufferAllocator.realloc(
661 &self.fixed_buffer_allocator.allocator,
662 old_mem,
663 old_align,
664 new_size,
665 new_align,
666 ) catch {
667 const result = try self.fallback_allocator.reallocFn(
668 self.fallback_allocator,
669 &[0]u8{},
670 undefined,
671 new_size,
672 new_align,
673 );
674 mem.copy(u8, result, old_mem);
675 return result;
676 };
677 }
678 return self.fallback_allocator.reallocFn(
679 self.fallback_allocator,
680 old_mem,
681 old_align,
682 new_size,
683 new_align,
684 );
630 return FixedBufferAllocator.alloc(&self.fixed_buffer_allocator, len, ptr_align) catch
631 return fallback_allocator.alloc(len, ptr_align);
685632 }
686633
687 fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
634 fn resize(self: *Allocator, buf: []u8, new_len: usize, len_align: u29) error{OutOfMemory}!void {
688635 const self = @fieldParentPtr(Self, "allocator", allocator);
689 const in_buffer = @ptrToInt(old_mem.ptr) >= @ptrToInt(&self.buffer) and
690 @ptrToInt(old_mem.ptr) < @ptrToInt(&self.buffer) + self.buffer.len;
691 if (in_buffer) {
692 return FixedBufferAllocator.shrink(
693 &self.fixed_buffer_allocator.allocator,
694 old_mem,
695 old_align,
696 new_size,
697 new_align,
698 );
636 if (self.fixed_buffer_allocator.ownsPtr(buf.ptr)) {
637 try self.fixed_buffer_allocator.callResizeFn(buf, new_len);
638 } else {
639 try self.fallback_allocator.callResizeFn(buf, new_len);
699640 }
700 return self.fallback_allocator.shrinkFn(
701 self.fallback_allocator,
702 old_mem,
703 old_align,
704 new_size,
705 new_align,
706 );
707641 }
708642 };
709643}
......@@ -718,8 +652,8 @@ test "c_allocator" {
718652
719653test "WasmPageAllocator internals" {
720654 if (comptime std.Target.current.isWasm()) {
721 const conventional_memsize = WasmPageAllocator.conventional.totalPages() * std.mem.page_size;
722 const initial = try page_allocator.alloc(u8, std.mem.page_size);
655 const conventional_memsize = WasmPageAllocator.conventional.totalPages() * mem.page_size;
656 const initial = try page_allocator.alloc(u8, mem.page_size);
723657 std.debug.assert(@ptrToInt(initial.ptr) < conventional_memsize); // If this isn't conventional, the rest of these tests don't make sense. Also we have a serious memory leak in the test suite.
724658
725659 var inplace = try page_allocator.realloc(initial, 1);
......@@ -799,7 +733,7 @@ test "ArenaAllocator" {
799733
800734var test_fixed_buffer_allocator_memory: [800000 * @sizeOf(u64)]u8 = undefined;
801735test "FixedBufferAllocator" {
802 var fixed_buffer_allocator = FixedBufferAllocator.init(test_fixed_buffer_allocator_memory[0..]);
736 var fixed_buffer_allocator = mem.validationWrap(FixedBufferAllocator.init(test_fixed_buffer_allocator_memory[0..]));
803737
804738 try testAllocator(&fixed_buffer_allocator.allocator);
805739 try testAllocatorAligned(&fixed_buffer_allocator.allocator, 16);
......@@ -865,7 +799,10 @@ test "ThreadSafeFixedBufferAllocator" {
865799 try testAllocatorAlignedShrink(&fixed_buffer_allocator.allocator);
866800}
867801
868fn testAllocator(allocator: *mem.Allocator) !void {
802fn testAllocator(base_allocator: *mem.Allocator) !void {
803 var validationAllocator = mem.validationWrap(base_allocator);
804 const allocator = &validationAllocator.allocator;
805
869806 var slice = try allocator.alloc(*i32, 100);
870807 testing.expect(slice.len == 100);
871808 for (slice) |*item, i| {
......@@ -893,7 +830,10 @@ fn testAllocator(allocator: *mem.Allocator) !void {
893830 allocator.free(slice);
894831}
895832
896fn testAllocatorAligned(allocator: *mem.Allocator, comptime alignment: u29) !void {
833fn testAllocatorAligned(base_allocator: *mem.Allocator, comptime alignment: u29) !void {
834 var validationAllocator = mem.validationWrap(base_allocator);
835 const allocator = &validationAllocator.allocator;
836
897837 // initial
898838 var slice = try allocator.alignedAlloc(u8, alignment, 10);
899839 testing.expect(slice.len == 10);
......@@ -917,7 +857,10 @@ fn testAllocatorAligned(allocator: *mem.Allocator, comptime alignment: u29) !voi
917857 testing.expect(slice.len == 0);
918858}
919859
920fn testAllocatorLargeAlignment(allocator: *mem.Allocator) mem.Allocator.Error!void {
860fn testAllocatorLargeAlignment(base_allocator: *mem.Allocator) mem.Allocator.Error!void {
861 var validationAllocator = mem.validationWrap(base_allocator);
862 const allocator = &validationAllocator.allocator;
863
921864 //Maybe a platform's page_size is actually the same as or
922865 // very near usize?
923866 if (mem.page_size << 2 > maxInt(usize)) return;
......@@ -946,7 +889,10 @@ fn testAllocatorLargeAlignment(allocator: *mem.Allocator) mem.Allocator.Error!vo
946889 allocator.free(slice);
947890}
948891
949fn testAllocatorAlignedShrink(allocator: *mem.Allocator) mem.Allocator.Error!void {
892fn testAllocatorAlignedShrink(base_allocator: *mem.Allocator) mem.Allocator.Error!void {
893 var validationAllocator = mem.validationWrap(base_allocator);
894 const allocator = &validationAllocator.allocator;
895
950896 var debug_buffer: [1000]u8 = undefined;
951897 const debug_allocator = &FixedBufferAllocator.init(&debug_buffer).allocator;
952898
lib/std/heap/arena_allocator.zig+6-21
......@@ -20,8 +20,8 @@ pub const ArenaAllocator = struct {
2020 pub fn promote(self: State, child_allocator: *Allocator) ArenaAllocator {
2121 return .{
2222 .allocator = Allocator{
23 .reallocFn = realloc,
24 .shrinkFn = shrink,
23 .allocFn = alloc,
24 .resizeFn = Allocator.noResize,
2525 },
2626 .child_allocator = child_allocator,
2727 .state = self,
......@@ -61,18 +61,18 @@ pub const ArenaAllocator = struct {
6161 return buf_node;
6262 }
6363
64 fn alloc(allocator: *Allocator, n: usize, alignment: u29) ![]u8 {
64 fn alloc(allocator: *Allocator, n: usize, ptr_align: u29, len_align: u29) ![]u8 {
6565 const self = @fieldParentPtr(ArenaAllocator, "allocator", allocator);
6666
67 var cur_node = if (self.state.buffer_list.first) |first_node| first_node else try self.createNode(0, n + alignment);
67 var cur_node = if (self.state.buffer_list.first) |first_node| first_node else try self.createNode(0, n + ptr_align);
6868 while (true) {
6969 const cur_buf = cur_node.data[@sizeOf(BufNode)..];
7070 const addr = @ptrToInt(cur_buf.ptr) + self.state.end_index;
71 const adjusted_addr = mem.alignForward(addr, alignment);
71 const adjusted_addr = mem.alignForward(addr, ptr_align);
7272 const adjusted_index = self.state.end_index + (adjusted_addr - addr);
7373 const new_end_index = adjusted_index + n;
7474 if (new_end_index > cur_buf.len) {
75 cur_node = try self.createNode(cur_buf.len, n + alignment);
75 cur_node = try self.createNode(cur_buf.len, n + ptr_align);
7676 continue;
7777 }
7878 const result = cur_buf[adjusted_index..new_end_index];
......@@ -80,19 +80,4 @@ pub const ArenaAllocator = struct {
8080 return result;
8181 }
8282 }
83
84 fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
85 if (new_size <= old_mem.len and new_align <= new_size) {
86 // We can't do anything with the memory, so tell the client to keep it.
87 return error.OutOfMemory;
88 } else {
89 const result = try alloc(allocator, new_size, new_align);
90 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
91 return result;
92 }
93 }
94
95 fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
96 return old_mem[0..new_size];
97 }
9883};
lib/std/heap/logging_allocator.zig+37-24
......@@ -15,39 +15,45 @@ pub fn LoggingAllocator(comptime OutStreamType: type) type {
1515 pub fn init(parent_allocator: *Allocator, out_stream: OutStreamType) Self {
1616 return Self{
1717 .allocator = Allocator{
18 .reallocFn = realloc,
19 .shrinkFn = shrink,
18 .allocFn = alloc,
19 .resizeFn = resize,
2020 },
2121 .parent_allocator = parent_allocator,
2222 .out_stream = out_stream,
2323 };
2424 }
2525
26 fn realloc(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
26 fn alloc(allocator: *Allocator, len: usize, ptr_align: u29, len_align: u29) error{OutOfMemory}![]u8 {
2727 const self = @fieldParentPtr(Self, "allocator", allocator);
28 if (old_mem.len == 0) {
29 self.out_stream.print("allocation of {} ", .{new_size}) catch {};
30 } else {
31 self.out_stream.print("resize from {} to {} ", .{ old_mem.len, new_size }) catch {};
32 }
33 const result = self.parent_allocator.reallocFn(self.parent_allocator, old_mem, old_align, new_size, new_align);
28 self.out_stream.print("alloc : {}", .{len}) catch {};
29 const result = self.parent_allocator.callAllocFn(len, ptr_align, len_align);
3430 if (result) |buff| {
35 self.out_stream.print("success!\n", .{}) catch {};
31 self.out_stream.print(" success!\n", .{}) catch {};
3632 } else |err| {
37 self.out_stream.print("failure!\n", .{}) catch {};
33 self.out_stream.print(" failure!\n", .{}) catch {};
3834 }
3935 return result;
4036 }
4137
42 fn shrink(allocator: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
38 fn resize(allocator: *Allocator, buf: []u8, new_len: usize, len_align: u29) error{OutOfMemory}!usize {
4339 const self = @fieldParentPtr(Self, "allocator", allocator);
44 const result = self.parent_allocator.shrinkFn(self.parent_allocator, old_mem, old_align, new_size, new_align);
45 if (new_size == 0) {
46 self.out_stream.print("free of {} bytes success!\n", .{old_mem.len}) catch {};
40 if (new_len == 0) {
41 self.out_stream.print("free : {}\n", .{buf.len}) catch {};
42 } else if (new_len <= buf.len) {
43 self.out_stream.print("shrink: {} to {}\n", .{buf.len, new_len}) catch {};
4744 } else {
48 self.out_stream.print("shrink from {} bytes to {} bytes success!\n", .{ old_mem.len, new_size }) catch {};
45 self.out_stream.print("expand: {} to {}", .{ buf.len, new_len }) catch {};
46 }
47 if (self.parent_allocator.callResizeFn(buf, new_len, len_align)) |resized_len| {
48 if (new_len > buf.len) {
49 self.out_stream.print(" success!\n", .{}) catch {};
50 }
51 return resized_len;
52 } else |e| {
53 std.debug.assert(new_len > buf.len);
54 self.out_stream.print(" failure!\n", .{}) catch {};
55 return e;
4956 }
50 return result;
5157 }
5258 };
5359}
......@@ -60,17 +66,24 @@ pub fn loggingAllocator(
6066}
6167
6268test "LoggingAllocator" {
63 var buf: [255]u8 = undefined;
64 var fbs = std.io.fixedBufferStream(&buf);
69 var log_buf: [255]u8 = undefined;
70 var fbs = std.io.fixedBufferStream(&log_buf);
6571
66 const allocator = &loggingAllocator(std.testing.allocator, fbs.outStream()).allocator;
72 var allocator_buf: [10]u8 = undefined;
73 var fixedBufferAllocator = std.mem.validationWrap(std.heap.FixedBufferAllocator.init(&allocator_buf));
74 const allocator = &loggingAllocator(&fixedBufferAllocator.allocator, fbs.outStream()).allocator;
6775
68 const ptr = try allocator.alloc(u8, 10);
69 allocator.free(ptr);
76 var a = try allocator.alloc(u8, 10);
77 a.len = allocator.shrinkBytes(a, 5, 0);
78 std.debug.assert(a.len == 5);
79 std.testing.expectError(error.OutOfMemory, allocator.callResizeFn(a, 20, 0));
80 allocator.free(a);
7081
7182 std.testing.expectEqualSlices(u8,
72 \\allocation of 10 success!
73 \\free of 10 bytes success!
83 \\alloc : 10 success!
84 \\shrink: 10 to 5
85 \\expand: 5 to 20 failure!
86 \\free : 5
7487 \\
7588 , fbs.getWritten());
7689}
lib/std/mem.zig+258-57
......@@ -16,6 +16,52 @@ pub const page_size = switch (builtin.arch) {
1616pub const Allocator = struct {
1717 pub const Error = error{OutOfMemory};
1818
19 /// Attempt to allocate at least `len` bytes aligned to `ptr_align`.
20 ///
21 /// If `len_align` is `0`, then the length returned MUST be exactly `len` bytes,
22 /// otherwise, the length must be aligned to `len_align`.
23 ///
24 /// `len` must be greater than or equal to `len_align` and must be aligned by `len_align`.
25 allocFn: fn (self: *Allocator, len: usize, ptr_align: u29, len_align: u29) Error![]u8,
26
27 /// Attempt to expand or shrink memory in place. `buf.len` must equal the most recent
28 /// length returned by `allocFn` or `resizeFn`.
29 ///
30 /// Passing a `new_len` of 0 frees and invalidates the buffer such that it can no
31 /// longer be passed to `resizeFn`.
32 ///
33 /// error.OutOfMemory can only be returned if `new_len` is greater than `buf.len`.
34 /// If `buf` cannot be expanded to accomodate `new_len`, then the allocation MUST be
35 /// unmodified and error.OutOfMemory MUST be returned.
36 ///
37 /// If `len_align` is `0`, then the length returned MUST be exactly `len` bytes,
38 /// otherwise, the length must be aligned to `len_align`.
39 ///
40 /// `new_len` must be greater than or equal to `len_align` and must be aligned by `len_align`.
41 resizeFn: fn (self: *Allocator, buf: []u8, new_len: usize, len_align: u29) Error!usize,
42
43 pub fn callAllocFn(self: *Allocator, new_len: usize, alignment: u29, len_align: u29) Error![]u8 {
44 return self.allocFn(self, new_len, alignment, len_align);
45 }
46
47 pub fn callResizeFn(self: *Allocator, buf: []u8, new_len: usize, len_align: u29) Error!usize {
48 return self.resizeFn(self, buf, new_len, len_align);
49 }
50
51 /// Set to resizeFn if in-place resize is not supported.
52 pub fn noResize(self: *Allocator, buf: []u8, new_len: usize, len_align: u29) Error!usize {
53 if (new_len > buf.len)
54 return error.OutOfMemory;
55 return new_len;
56 }
57
58 /// Call `resizeFn`, but caller guarantees that `new_len` <= `buf.len` meaning
59 /// error.OutOfMemory should be impossible.
60 pub fn shrinkBytes(self: *Allocator, buf: []u8, new_len: usize, len_align: u29) usize {
61 assert(new_len <= buf.len);
62 return self.callResizeFn(buf, new_len, len_align) catch unreachable;
63 }
64
1965 /// Realloc is used to modify the size or alignment of an existing allocation,
2066 /// as well as to provide the allocator with an opportunity to move an allocation
2167 /// to a better location.
......@@ -24,7 +70,7 @@ pub const Allocator = struct {
2470 /// When the size/alignment is less than or equal to the previous allocation,
2571 /// this function returns `error.OutOfMemory` when the allocator decides the client
2672 /// would be better off keeping the extra alignment/size. Clients will call
27 /// `shrinkFn` when they require the allocator to track a new alignment/size,
73 /// `callResizeFn` when they require the allocator to track a new alignment/size,
2874 /// and so this function should only return success when the allocator considers
2975 /// the reallocation desirable from the allocator's perspective.
3076 /// As an example, `std.ArrayList` tracks a "capacity", and therefore can handle
......@@ -37,16 +83,15 @@ pub const Allocator = struct {
3783 /// as `old_mem` was when `reallocFn` is called. The bytes of
3884 /// `return_value[old_mem.len..]` have undefined values.
3985 /// The returned slice must have its pointer aligned at least to `new_alignment` bytes.
40 reallocFn: fn (
86 fn reallocBytes(
4187 self: *Allocator,
4288 /// Guaranteed to be the same as what was returned from most recent call to
43 /// `reallocFn` or `shrinkFn`.
89 /// `allocFn` or `resizeFn`.
4490 /// If `old_mem.len == 0` then this is a new allocation and `new_byte_count`
4591 /// is guaranteed to be >= 1.
4692 old_mem: []u8,
4793 /// If `old_mem.len == 0` then this is `undefined`, otherwise:
48 /// Guaranteed to be the same as what was returned from most recent call to
49 /// `reallocFn` or `shrinkFn`.
94 /// Guaranteed to be the same as what was passed to `allocFn`.
5095 /// Guaranteed to be >= 1.
5196 /// Guaranteed to be a power of 2.
5297 old_alignment: u29,
......@@ -57,23 +102,52 @@ pub const Allocator = struct {
57102 /// Guaranteed to be a power of 2.
58103 /// Returned slice's pointer must have this alignment.
59104 new_alignment: u29,
60 ) Error![]u8,
105 /// 0 indicates the length of the slice returned MUST match `new_byte_count` exactly
106 /// non-zero means the length of the returned slice must be aligned by `len_align`
107 /// `new_len` must be aligned by `len_align`
108 len_align: u29,
109 ) Error![]u8 {
110 if (old_mem.len == 0) {
111 const new_mem = try self.callAllocFn(new_byte_count, new_alignment, len_align);
112 @memset(new_mem.ptr, undefined, new_byte_count);
113 return new_mem;
114 }
61115
62 /// This function deallocates memory. It must succeed.
63 shrinkFn: fn (
64 self: *Allocator,
65 /// Guaranteed to be the same as what was returned from most recent call to
66 /// `reallocFn` or `shrinkFn`.
67 old_mem: []u8,
68 /// Guaranteed to be the same as what was returned from most recent call to
69 /// `reallocFn` or `shrinkFn`.
70 old_alignment: u29,
71 /// Guaranteed to be less than or equal to `old_mem.len`.
72 new_byte_count: usize,
73 /// If `new_byte_count == 0` then this is `undefined`, otherwise:
74 /// Guaranteed to be less than or equal to `old_alignment`.
75 new_alignment: u29,
76 ) []u8,
116 if (isAligned(@ptrToInt(old_mem.ptr), new_alignment)) {
117 if (new_byte_count <= old_mem.len) {
118 const shrunk_len = self.shrinkBytes(old_mem, new_byte_count, len_align);
119 if (shrunk_len < old_mem.len) {
120 @memset(old_mem.ptr + shrunk_len, undefined, old_mem.len - shrunk_len);
121 }
122 return old_mem.ptr[0..shrunk_len];
123 }
124 if (self.callResizeFn(old_mem, new_byte_count, len_align)) |resized_len| {
125 assert(resized_len >= new_byte_count);
126 @memset(old_mem.ptr + new_byte_count, undefined, resized_len - new_byte_count);
127 return old_mem.ptr[0..resized_len];
128 } else |_| { }
129 }
130 if (new_byte_count <= old_mem.len and new_alignment <= old_alignment) {
131 return error.OutOfMemory;
132 }
133 return self.moveBytes(old_mem, new_byte_count, new_alignment, len_align);
134 }
135
136 /// Move the given memory to a new location in the given allocator to accomodate a new
137 /// size and alignment.
138 fn moveBytes(self: *Allocator, old_mem: []u8, new_len: usize, new_alignment: u29, len_align: u29) Error![]u8 {
139 assert(old_mem.len > 0);
140 assert(new_len > 0);
141 const new_mem = try self.callAllocFn(new_len, new_alignment, len_align);
142 @memcpy(new_mem.ptr, old_mem.ptr, std.math.min(new_len, old_mem.len));
143 // DISABLED TO AVOID BUGS IN TRANSLATE C
144 // use './zig build test-translate-c' to reproduce, some of the symbols in the
145 // generated C code will be a sequence of 0xaa (the undefined value), meaning
146 // it is printing data that has been freed
147 //@memset(old_mem.ptr, undefined, old_mem.len);
148 _ = self.shrinkBytes(old_mem, 0, 0);
149 return new_mem;
150 }
77151
78152 /// Returns a pointer to undefined memory.
79153 /// Call `destroy` with the result to free the memory.
......@@ -89,8 +163,7 @@ pub const Allocator = struct {
89163 const T = @TypeOf(ptr).Child;
90164 if (@sizeOf(T) == 0) return;
91165 const non_const_ptr = @intToPtr([*]u8, @ptrToInt(ptr));
92 const shrink_result = self.shrinkFn(self, non_const_ptr[0..@sizeOf(T)], @alignOf(T), 0, 1);
93 assert(shrink_result.len == 0);
166 _ = self.shrinkBytes(non_const_ptr[0..@sizeOf(T)], 0, 0);
94167 }
95168
96169 /// Allocates an array of `n` items of type `T` and sets all the
......@@ -144,15 +217,28 @@ pub const Allocator = struct {
144217 return self.allocWithOptions(Elem, n, null, sentinel);
145218 }
146219
220 /// Deprecated: use `allocAdvanced`
147221 pub fn alignedAlloc(
148222 self: *Allocator,
149223 comptime T: type,
150224 /// null means naturally aligned
151225 comptime alignment: ?u29,
152226 n: usize,
227 ) Error![]align(alignment orelse @alignOf(T)) T {
228 return self.allocAdvanced(T, alignment, n, .exact);
229 }
230
231 const Exact = enum {exact,at_least};
232 pub fn allocAdvanced(
233 self: *Allocator,
234 comptime T: type,
235 /// null means naturally aligned
236 comptime alignment: ?u29,
237 n: usize,
238 exact: Exact,
153239 ) Error![]align(alignment orelse @alignOf(T)) T {
154240 const a = if (alignment) |a| blk: {
155 if (a == @alignOf(T)) return alignedAlloc(self, T, null, n);
241 if (a == @alignOf(T)) return allocAdvanced(self, T, null, n, exact);
156242 break :blk a;
157243 } else @alignOf(T);
158244
......@@ -161,15 +247,19 @@ pub const Allocator = struct {
161247 }
162248
163249 const byte_count = math.mul(usize, @sizeOf(T), n) catch return Error.OutOfMemory;
164 const byte_slice = try self.reallocFn(self, &[0]u8{}, undefined, byte_count, a);
165 assert(byte_slice.len == byte_count);
250 // TODO The `if (alignment == null)` blocks are workarounds for zig not being able to
251 // access certain type information about T without creating a circular dependency in async
252 // functions that heap-allocate their own frame with @Frame(func).
253 const sizeOfT = if (alignment == null) @intCast(u29, @divExact(byte_count, n)) else @sizeOf(T);
254 const byte_slice = try self.callAllocFn(byte_count, a, if (exact == .exact) @as(u29, 0) else sizeOfT);
255 switch (exact) {
256 .exact => assert(byte_slice.len == byte_count),
257 .at_least => assert(byte_slice.len >= byte_count),
258 }
166259 @memset(byte_slice.ptr, undefined, byte_slice.len);
167260 if (alignment == null) {
168 // TODO This is a workaround for zig not being able to successfully do
169 // @bytesToSlice(T, @alignCast(a, byte_slice)) without resolving alignment of T,
170 // which causes a circular dependency in async functions which try to heap-allocate
171 // their own frame with @Frame(func).
172 return @intToPtr([*]T, @ptrToInt(byte_slice.ptr))[0..n];
261 // This if block is a workaround (see comment above)
262 return @intToPtr([*]T, @ptrToInt(byte_slice.ptr))[0..@divExact(byte_slice.len, @sizeOf(T))];
173263 } else {
174264 return mem.bytesAsSlice(T, @alignCast(a, byte_slice));
175265 }
......@@ -190,22 +280,41 @@ pub const Allocator = struct {
190280 break :t Error![]align(Slice.alignment) Slice.child;
191281 } {
192282 const old_alignment = @typeInfo(@TypeOf(old_mem)).Pointer.alignment;
193 return self.alignedRealloc(old_mem, old_alignment, new_n);
283 return self.reallocAdvanced(old_mem, old_alignment, new_n, .exact);
284 }
285
286 pub fn reallocAtLeast(self: *Allocator, old_mem: var, new_n: usize) t: {
287 const Slice = @typeInfo(@TypeOf(old_mem)).Pointer;
288 break :t Error![]align(Slice.alignment) Slice.child;
289 } {
290 const old_alignment = @typeInfo(@TypeOf(old_mem)).Pointer.alignment;
291 return self.reallocAdvanced(old_mem, old_alignment, new_n, .at_least);
292 }
293
294 // Deprecated: use `reallocAdvanced`
295 pub fn alignedRealloc(
296 self: *Allocator,
297 old_mem: var,
298 comptime new_alignment: u29,
299 new_n: usize,
300 ) Error![]align(new_alignment) @typeInfo(@TypeOf(old_mem)).Pointer.child {
301 return self.reallocAdvanced(old_mem, new_alignment, new_n, .exact);
194302 }
195303
196304 /// This is the same as `realloc`, except caller may additionally request
197305 /// a new alignment, which can be larger, smaller, or the same as the old
198306 /// allocation.
199 pub fn alignedRealloc(
307 pub fn reallocAdvanced(
200308 self: *Allocator,
201309 old_mem: var,
202310 comptime new_alignment: u29,
203311 new_n: usize,
312 exact: Exact,
204313 ) Error![]align(new_alignment) @typeInfo(@TypeOf(old_mem)).Pointer.child {
205314 const Slice = @typeInfo(@TypeOf(old_mem)).Pointer;
206315 const T = Slice.child;
207316 if (old_mem.len == 0) {
208 return self.alignedAlloc(T, new_alignment, new_n);
317 return self.allocAdvanced(T, new_alignment, new_n, exact);
209318 }
210319 if (new_n == 0) {
211320 self.free(old_mem);
......@@ -215,12 +324,9 @@ pub const Allocator = struct {
215324 const old_byte_slice = mem.sliceAsBytes(old_mem);
216325 const byte_count = math.mul(usize, @sizeOf(T), new_n) catch return Error.OutOfMemory;
217326 // Note: can't set shrunk memory to undefined as memory shouldn't be modified on realloc failure
218 const byte_slice = try self.reallocFn(self, old_byte_slice, Slice.alignment, byte_count, new_alignment);
219 assert(byte_slice.len == byte_count);
220 if (new_n > old_mem.len) {
221 @memset(byte_slice.ptr + old_byte_slice.len, undefined, byte_slice.len - old_byte_slice.len);
222 }
223 return mem.bytesAsSlice(T, @alignCast(new_alignment, byte_slice));
327 const new_byte_slice = try self.reallocBytes(old_byte_slice, Slice.alignment, byte_count, new_alignment,
328 if (exact == .exact) @as(u29, 0) else @sizeOf(T));
329 return mem.bytesAsSlice(T, @alignCast(new_alignment, new_byte_slice));
224330 }
225331
226332 /// Prefer calling realloc to shrink if you can tolerate failure, such as
......@@ -248,12 +354,9 @@ pub const Allocator = struct {
248354 const Slice = @typeInfo(@TypeOf(old_mem)).Pointer;
249355 const T = Slice.child;
250356
251 if (new_n == 0) {
252 self.free(old_mem);
253 return old_mem[0..0];
254 }
255
256 assert(new_n <= old_mem.len);
357 if (new_n == old_mem.len)
358 return old_mem;
359 assert(new_n < old_mem.len);
257360 assert(new_alignment <= Slice.alignment);
258361
259362 // Here we skip the overflow checking on the multiplication because
......@@ -262,9 +365,8 @@ pub const Allocator = struct {
262365
263366 const old_byte_slice = mem.sliceAsBytes(old_mem);
264367 @memset(old_byte_slice.ptr + byte_count, undefined, old_byte_slice.len - byte_count);
265 const byte_slice = self.shrinkFn(self, old_byte_slice, Slice.alignment, byte_count, new_alignment);
266 assert(byte_slice.len == byte_count);
267 return mem.bytesAsSlice(T, @alignCast(new_alignment, byte_slice));
368 _ = self.shrinkBytes(old_byte_slice, byte_count, 0);
369 return old_mem[0..new_n];
268370 }
269371
270372 /// Free an array allocated with `alloc`. To free a single item,
......@@ -276,8 +378,7 @@ pub const Allocator = struct {
276378 if (bytes_len == 0) return;
277379 const non_const_ptr = @intToPtr([*]u8, @ptrToInt(bytes.ptr));
278380 @memset(non_const_ptr, undefined, bytes_len);
279 const shrink_result = self.shrinkFn(self, non_const_ptr[0..bytes_len], Slice.alignment, 0, 1);
280 assert(shrink_result.len == 0);
381 _ = self.shrinkBytes(non_const_ptr[0..bytes_len], 0, 0);
281382 }
282383
283384 /// Copies `m` to newly allocated memory. Caller owns the memory.
......@@ -296,16 +397,94 @@ pub const Allocator = struct {
296397 }
297398};
298399
400/// Detects and asserts if the std.mem.Allocator interface is violated by the caller
401/// or the allocator.
402pub fn ValidationAllocator(comptime T: type) type { return struct {
403 const Self = @This();
404 allocator: Allocator,
405 underlying_allocator: T,
406 pub fn init(allocator: T) @This() {
407 return .{
408 .allocator = .{
409 .allocFn = alloc,
410 .resizeFn = resize,
411 },
412 .underlying_allocator = allocator,
413 };
414 }
415 fn getUnderlyingAllocatorPtr(self: *@This()) *Allocator {
416 if (T == *Allocator) return self.underlying_allocator;
417 if (*T == *Allocator) return &self.underlying_allocator;
418 return &self.underlying_allocator.allocator;
419 }
420 pub fn alloc(allocator: *Allocator, n: usize, ptr_align: u29, len_align: u29) Allocator.Error![]u8 {
421 assert(n > 0);
422 assert(mem.isValidAlign(ptr_align));
423 if (len_align != 0) {
424 assert(mem.isAlignedAnyAlign(n, len_align));
425 assert(n >= len_align);
426 }
427
428 const self = @fieldParentPtr(@This(), "allocator", allocator);
429 const result = try self.getUnderlyingAllocatorPtr().callAllocFn(n, ptr_align, len_align);
430 assert(mem.isAligned(@ptrToInt(result.ptr), ptr_align));
431 if (len_align == 0) {
432 assert(result.len == n);
433 } else {
434 assert(result.len >= n);
435 assert(mem.isAlignedAnyAlign(result.len, len_align));
436 }
437 return result;
438 }
439 pub fn resize(allocator: *Allocator, buf: []u8, new_len: usize, len_align: u29) Allocator.Error!usize {
440 assert(buf.len > 0);
441 if (len_align != 0) {
442 assert(mem.isAlignedAnyAlign(new_len, len_align));
443 assert(new_len >= len_align);
444 }
445 const self = @fieldParentPtr(@This(), "allocator", allocator);
446 const result = try self.getUnderlyingAllocatorPtr().callResizeFn(buf, new_len, len_align);
447 if (len_align == 0) {
448 assert(result == new_len);
449 } else {
450 assert(result >= new_len);
451 assert(mem.isAlignedAnyAlign(result, len_align));
452 }
453 return result;
454 }
455 pub usingnamespace if (T == *Allocator or !@hasDecl(T, "reset")) struct {} else struct {
456 pub fn reset(self: *Self) void {
457 self.underlying_allocator.reset();
458 }
459 };
460};}
461
462pub fn validationWrap(allocator: var) ValidationAllocator(@TypeOf(allocator)) {
463 return ValidationAllocator(@TypeOf(allocator)).init(allocator);
464}
465
466/// An allocator helper function. Adjusts an allocation length satisfy `len_align`.
467/// `full_len` should be the full capacity of the allocation which may be greater
468/// than the `len` that was requsted. This function should only be used by allocators
469/// that are unaffected by `len_align`.
470pub fn alignAllocLen(full_len: usize, alloc_len: usize, len_align: u29) usize {
471 assert(alloc_len > 0);
472 assert(alloc_len >= len_align);
473 assert(full_len >= alloc_len);
474 if (len_align == 0)
475 return alloc_len;
476 const adjusted = alignBackwardAnyAlign(full_len, len_align);
477 assert(adjusted >= alloc_len);
478 return adjusted;
479}
480
299481var failAllocator = Allocator{
300 .reallocFn = failAllocatorRealloc,
301 .shrinkFn = failAllocatorShrink,
482 .allocFn = failAllocatorAlloc,
483 .resizeFn = Allocator.noResize,
302484};
303fn failAllocatorRealloc(self: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
485fn failAllocatorAlloc(self: *Allocator, n: usize, alignment: u29, len_align: u29) Allocator.Error![]u8 {
304486 return error.OutOfMemory;
305487}
306fn failAllocatorShrink(self: *Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
307 @panic("failAllocatorShrink should never be called because it cannot allocate");
308}
309488
310489test "mem.Allocator basics" {
311490 testing.expectError(error.OutOfMemory, failAllocator.alloc(u8, 1));
......@@ -2190,6 +2369,15 @@ test "alignForward" {
21902369 testing.expect(alignForward(17, 8) == 24);
21912370}
21922371
2372/// Round an address up to the previous aligned address
2373/// Unlike `alignBackward`, `alignment` can be any positive number, not just a power of 2.
2374pub fn alignBackwardAnyAlign(i: usize, alignment: usize) usize {
2375 if (@popCount(usize, alignment) == 1)
2376 return alignBackward(i, alignment);
2377 assert(alignment != 0);
2378 return i - @mod(i, alignment);
2379}
2380
21932381/// Round an address up to the previous aligned address
21942382/// The alignment must be a power of 2 and greater than 0.
21952383pub fn alignBackward(addr: usize, alignment: usize) usize {
......@@ -2206,6 +2394,19 @@ pub fn alignBackwardGeneric(comptime T: type, addr: T, alignment: T) T {
22062394 return addr & ~(alignment - 1);
22072395}
22082396
2397/// Returns whether `alignment` is a valid alignment, meaning it is
2398/// a positive power of 2.
2399pub fn isValidAlign(alignment: u29) bool {
2400 return @popCount(u29, alignment) == 1;
2401}
2402
2403pub fn isAlignedAnyAlign(i: usize, alignment: usize) bool {
2404 if (@popCount(usize, alignment) == 1)
2405 return isAligned(i, alignment);
2406 assert(alignment != 0);
2407 return 0 == @mod(i, alignment);
2408}
2409
22092410/// Given an address and an alignment, return true if the address is a multiple of the alignment
22102411/// The alignment must be a power of 2 and greater than 0.
22112412pub fn isAligned(addr: usize, alignment: usize) bool {
lib/std/os/windows/bits.zig+1
......@@ -593,6 +593,7 @@ pub const FILE_CURRENT = 1;
593593pub const FILE_END = 2;
594594
595595pub const HEAP_CREATE_ENABLE_EXECUTE = 0x00040000;
596pub const HEAP_REALLOC_IN_PLACE_ONLY = 0x00000010;
596597pub const HEAP_GENERATE_EXCEPTIONS = 0x00000004;
597598pub const HEAP_NO_SERIALIZE = 0x00000001;
598599
lib/std/testing.zig+1-1
......@@ -11,7 +11,7 @@ pub var allocator_instance = LeakCountAllocator.init(&base_allocator_instance.al
1111pub const failing_allocator = &failing_allocator_instance.allocator;
1212pub var failing_allocator_instance = FailingAllocator.init(&base_allocator_instance.allocator, 0);
1313
14pub var base_allocator_instance = std.heap.ThreadSafeFixedBufferAllocator.init(allocator_mem[0..]);
14pub var base_allocator_instance = std.mem.validationWrap(std.heap.ThreadSafeFixedBufferAllocator.init(allocator_mem[0..]));
1515var allocator_mem: [2 * 1024 * 1024]u8 = undefined;
1616
1717/// This function is intended to be used only in tests. It prints diagnostics to stderr
lib/std/testing/failing_allocator.zig+18-23
......@@ -39,43 +39,38 @@ pub const FailingAllocator = struct {
3939 .allocations = 0,
4040 .deallocations = 0,
4141 .allocator = mem.Allocator{
42 .reallocFn = realloc,
43 .shrinkFn = shrink,
42 .allocFn = alloc,
43 .resizeFn = resize,
4444 },
4545 };
4646 }
4747
48 fn realloc(allocator: *mem.Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
48 fn alloc(allocator: *std.mem.Allocator, len: usize, ptr_align: u29, len_align: u29) error{OutOfMemory}![]u8 {
4949 const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);
5050 if (self.index == self.fail_index) {
5151 return error.OutOfMemory;
5252 }
53 const result = try self.internal_allocator.reallocFn(
54 self.internal_allocator,
55 old_mem,
56 old_align,
57 new_size,
58 new_align,
59 );
60 if (new_size < old_mem.len) {
61 self.freed_bytes += old_mem.len - new_size;
62 if (new_size == 0)
63 self.deallocations += 1;
64 } else if (new_size > old_mem.len) {
65 self.allocated_bytes += new_size - old_mem.len;
66 if (old_mem.len == 0)
67 self.allocations += 1;
68 }
53 const result = try self.internal_allocator.callAllocFn(len, ptr_align, len_align);
54 self.allocated_bytes += result.len;
55 self.allocations += 1;
6956 self.index += 1;
7057 return result;
7158 }
7259
73 fn shrink(allocator: *mem.Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
60 fn resize(allocator: *std.mem.Allocator, old_mem: []u8, new_len: usize, len_align: u29) error{OutOfMemory}!usize {
7461 const self = @fieldParentPtr(FailingAllocator, "allocator", allocator);
75 const r = self.internal_allocator.shrinkFn(self.internal_allocator, old_mem, old_align, new_size, new_align);
76 self.freed_bytes += old_mem.len - r.len;
77 if (new_size == 0)
62 const r = self.internal_allocator.callResizeFn(old_mem, new_len, len_align) catch |e| {
63 std.debug.assert(new_len > old_mem.len);
64 return e;
65 };
66 if (new_len == 0) {
7867 self.deallocations += 1;
68 self.freed_bytes += old_mem.len;
69 } else if (r < old_mem.len) {
70 self.freed_bytes += old_mem.len - r;
71 } else {
72 self.allocated_bytes += r - old_mem.len;
73 }
7974 return r;
8075 }
8176};
lib/std/testing/leak_count_allocator.zig+11-10
......@@ -14,23 +14,21 @@ pub const LeakCountAllocator = struct {
1414 return .{
1515 .count = 0,
1616 .allocator = .{
17 .reallocFn = realloc,
18 .shrinkFn = shrink,
17 .allocFn = alloc,
18 .resizeFn = resize,
1919 },
2020 .internal_allocator = allocator,
2121 };
2222 }
2323
24 fn realloc(allocator: *std.mem.Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) ![]u8 {
24 fn alloc(allocator: *std.mem.Allocator, len: usize, ptr_align: u29, len_align: u29) error{OutOfMemory}![]u8 {
2525 const self = @fieldParentPtr(LeakCountAllocator, "allocator", allocator);
26 var data = try self.internal_allocator.reallocFn(self.internal_allocator, old_mem, old_align, new_size, new_align);
27 if (old_mem.len == 0) {
28 self.count += 1;
29 }
30 return data;
26 const ptr = try self.internal_allocator.callAllocFn(len, ptr_align, len_align);
27 self.count += 1;
28 return ptr;
3129 }
3230
33 fn shrink(allocator: *std.mem.Allocator, old_mem: []u8, old_align: u29, new_size: usize, new_align: u29) []u8 {
31 fn resize(allocator: *std.mem.Allocator, old_mem: []u8, new_size: usize, len_align: u29) error{OutOfMemory}!usize {
3432 const self = @fieldParentPtr(LeakCountAllocator, "allocator", allocator);
3533 if (new_size == 0) {
3634 if (self.count == 0) {
......@@ -38,7 +36,10 @@ pub const LeakCountAllocator = struct {
3836 }
3937 self.count -= 1;
4038 }
41 return self.internal_allocator.shrinkFn(self.internal_allocator, old_mem, old_align, new_size, new_align);
39 return self.internal_allocator.callResizeFn(old_mem, new_size, len_align) catch |e| {
40 std.debug.assert(new_size > old_mem.len);
41 return e;
42 };
4243 }
4344
4445 pub fn validate(self: LeakCountAllocator) !void {