neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor tweaks to walker

Browse source 
its generally preferred to use *Unmanaged data structures if youre
storing multiple so you dont have redundant allocators
This commit is contained in:
xdBronch 2024-10-12 01:06:20 -04:00 • committed by CJ van den Berg
parent 64056ad045
commit e9a2ae79c4
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/project_manager.zig
View file

@ -789,8 +789,9 @@ fn is_filtered_dir(dirname: []const u8) bool {
} }
const FilteredWalker = struct { const FilteredWalker = struct {
stack: std.ArrayList(StackItem), allocator: std.mem.Allocator,
name_buffer: std.ArrayList(u8), stack: std.ArrayListUnmanaged(StackItem),
name_buffer: std.ArrayListUnmanaged(u8),
const Path = []const u8; const Path = []const u8;
@ -813,10 +814,10 @@ const FilteredWalker = struct {
}) |base| { }) |base| {
self.name_buffer.shrinkRetainingCapacity(dirname_len); self.name_buffer.shrinkRetainingCapacity(dirname_len);
if (self.name_buffer.items.len != 0) { if (self.name_buffer.items.len != 0) {
try self.name_buffer.append(std.fs.path.sep); try self.name_buffer.append(self.allocator, std.fs.path.sep);
dirname_len += 1; dirname_len += 1;
} }
try self.name_buffer.appendSlice(base.name); try self.name_buffer.appendSlice(self.allocator, base.name);
switch (base.kind) { switch (base.kind) {
.directory => { .directory => {
if (is_filtered_dir(base.name)) if (is_filtered_dir(base.name))
@ -827,7 +828,7 @@ const FilteredWalker = struct {
}; };
{ {
errdefer new_dir.close(); errdefer new_dir.close();
try self.stack.append(StackItem{ try self.stack.append(self.allocator, .{
.iter = new_dir.iterateAssumeFirstIteration(), .iter = new_dir.iterateAssumeFirstIteration(),
.dirname_len = self.name_buffer.items.len, .dirname_len = self.name_buffer.items.len,
}); });
@ -855,26 +856,24 @@ const FilteredWalker = struct {
item.iter.dir.close(); item.iter.dir.close();
} }
} }
self.stack.deinit(); self.stack.deinit(self.allocator);
self.name_buffer.deinit(); self.name_buffer.deinit(self.allocator);
} }
}; };
fn walk_filtered(dir: std.fs.Dir, allocator: std.mem.Allocator) !FilteredWalker { fn walk_filtered(dir: std.fs.Dir, allocator: std.mem.Allocator) !FilteredWalker {
var name_buffer = std.ArrayList(u8).init(allocator); var stack: std.ArrayListUnmanaged(FilteredWalker.StackItem) = .{};
errdefer name_buffer.deinit(); errdefer stack.deinit(allocator);
var stack = std.ArrayList(FilteredWalker.StackItem).init(allocator); try stack.append(allocator, .{
errdefer stack.deinit();
try stack.append(FilteredWalker.StackItem{
.iter = dir.iterate(), .iter = dir.iterate(),
.dirname_len = 0, .dirname_len = 0,
}); });
return FilteredWalker{ return .{
.allocator = allocator,
.stack = stack, .stack = stack,
.name_buffer = name_buffer, .name_buffer = .{},
}; };
} }