Skip to content

Package.init allocate temporary stuff with arena #22

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

Open
D-Berg wants to merge 1 commit into from
+13 −7
Open

Package.init allocate temporary stuff with arena #22

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
20 changes: 13 additions & 7 deletions src/Package.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ pub const State = struct {
pub fn get(self: *const State, id: Id) ?Package {
assert(id != .none);
const index = self.package_table.get(id) orelse return null;

const package_index = @intFromEnum(index);
assert(package_index < self.packages.len);
const package = self.packages.get(package_index);
Expand Down Expand Up @@ -150,20 +151,25 @@ pub fn init(
) !Package {
assert(pkg_name.len > 0);
assert(repo.len > 0);
var path_buf: [Io.Dir.max_path_bytes]u8 = undefined;
const manifest_path = try std.fmt.bufPrintZ(&path_buf, "@/opt/packa/repos/{s}/manifests/{c}/{s}.lua", .{
repo, pkg_name[0], pkg_name,
});
var arena_impl: std.heap.ArenaAllocator = .init(gpa);
defer arena_impl.deinit();

const arena = arena_impl.allocator();

const manifest_path = try std.fmt.allocPrintSentinel(arena, "@/opt/packa/repos/{s}/manifests/{c}/{s}.lua", .{
repo,
pkg_name[0],
pkg_name,
}, 0);
const manifest_stat = try packa_dir.statFile(io, manifest_path[1..], .{ .follow_symlinks = true });
const manifest = try packa_dir.readFileAllocOptions(
io,
manifest_path[1..],
gpa,
.limited64(manifest_stat.size + 1),
arena,
.limited64(manifest_stat.size + 1), // zero sentinel
.of(u8),
0,
);
defer gpa.free(manifest);

if (hash) |h| {
h.update(manifest);
Expand Down