Skip to content

perf: page_allocator for worker arenas + eager free + index shrink (#261) #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justrach merged 1 commit into from
Apr 13, 2026
+9 −3
Merged

perf: page_allocator for worker arenas + eager free + index shrink (#261) #263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/watcher.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ pub fn initialScanWithWorkerCount(store: *Store, explorer: *Explorer, root: []co
if (n_workers == 1) {
for (entries.items) |entry| {
{
var arena = std.heap.ArenaAllocator.init(allocator);
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena.deinit();
const parsed = try parseInitialScanEntry(root, entry, arena.allocator());
if (parsed) |file| {
Expand All @@ -431,8 +431,10 @@ pub fn initialScanWithWorkerCount(store: *Store, explorer: *Explorer, root: []co
}

const workers = try allocator.alloc(WorkerParsedResults, n_workers);
var workers_committed: usize = 0;
defer {
for (workers) |*worker| worker.deinit(allocator);
// Free any workers not yet committed (on error path)
for (workers[workers_committed..]) |*worker| worker.deinit(allocator);
allocator.free(workers);
}
const threads = try allocator.alloc(std.Thread, n_workers);
Expand All @@ -442,7 +444,7 @@ pub fn initialScanWithWorkerCount(store: *Store, explorer: *Explorer, root: []co
const remainder = entries.items.len % n_workers;
var offset: usize = 0;
for (workers, 0..) |*worker, i| {
worker.* = WorkerParsedResults.init(allocator);
worker.* = WorkerParsedResults.init(std.heap.page_allocator);
const extra: usize = if (i < remainder) 1 else 0;
const count = chunk_size + extra;
const chunk = entries.items[offset .. offset + count];
Expand All @@ -455,6 +457,10 @@ pub fn initialScanWithWorkerCount(store: *Store, explorer: *Explorer, root: []co
for (worker.items.items) |file| {
try explorer.commitParsedFileOwnedOutline(file.path, file.content, file.outline, true, file.skip_trigram);
}
// Free this worker's arena immediately — releases pages to OS,
// prevents holding all workers' content simultaneously.
worker.deinit(allocator);
workers_committed += 1;
}
}

Expand Down
Loading