diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/memory.zig | 26 | ||||
| -rw-r--r-- | src/pardes.zig | 11 |
2 files changed, 11 insertions, 26 deletions
diff --git a/src/memory.zig b/src/memory.zig index cd29308f..c1b24e6f 100644 --- a/src/memory.zig +++ b/src/memory.zig @@ -215,26 +215,21 @@ const Pages = struct { if (n * granule >= release_min and n * granule < keep_min) advise(self.region[start * granule ..][0 .. n * granule], std.posix.MADV.DONTNEED); } - /// Gives back the pages of every free run in `n` granules from `start`. - fn giveBack(self: *Pages, start: usize, n: usize) void { - var i = start; - while (i < start + n) { + /// Gives back the pages of every free run below `top`: the small ones + /// `release` keeps resident, small and big. + fn trim(self: *Pages) void { + var i: usize = 0; + while (i < self.top) { if (i % 64 == 0 and self.used[i / 64] == ~@as(u64, 0)) { i += 64; continue; } - const run = freeRun(self.used, i, start + n - i); + const run = freeRun(self.used, i, self.top - i); if (run > 0) advise(self.region[i * granule ..][0 .. run * granule], std.posix.MADV.DONTNEED); i += run + 1; } } - /// Gives back every free run below `top`: the small ones `release` - /// keeps resident, small and big. - fn trim(self: *Pages) void { - self.giveBack(0, self.top); - } - /// The first free run of `n` granules starting at a multiple of `step`. // ponytail: first fit, a scan of the region's bitmap (32 KiB for 1 GiB) // per page-sized block; a free-run index if a profile ever shows it. @@ -556,12 +551,9 @@ pub fn init(fallback: Allocator) Allocators { /// A Debug build's leak report, each arena's own (it panics on a leak). pub fn deinit() void { if (!debug_enabled) return; - var leaked = pardes_region.deinit(); - leaked = frame_region.deinit() or leaked; - leaked = lsp_region.deinit() or leaked; - leaked = tree_sitter_region.deinit() or leaked; - leaked = image_region.deinit() or leaked; - leaked = pdf_region.deinit() or leaked; + var leaked = false; + // The host's arena lives as long as the process (`host`). + inline for (.{ &pardes_region, &frame_region, &lsp_region, &tree_sitter_region, &image_region, &pdf_region }) |r| leaked = r.deinit() or leaked; if (leaked) @panic("allocator leaks detected"); } diff --git a/src/pardes.zig b/src/pardes.zig index 5522af74..f19d9b17 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -4428,15 +4428,8 @@ pub const Pardes = struct { look.cancelLookHover(p); if (p.repl_ask) |ask| p.gpa.free(ask.text); for (0..MAX_PANES) |id| p.dropPendingWrite(id); - for (&p.panes) |*slot| if (slot.*) |pane| { - p.teardownPane(pane); - slot.* = null; - }; - for (&p.retired_panes.previous) |*slot| if (slot.*) |pane| { - p.teardownPane(pane); - slot.* = null; - }; - for (&p.retired_panes.current) |*slot| if (slot.*) |pane| { + // The panes, then those retired these last two frames. + inline for (.{ &p.panes, &p.retired_panes.previous, &p.retired_panes.current }) |slots| for (slots) |*slot| if (slot.*) |pane| { p.teardownPane(pane); slot.* = null; }; |
