Use less allocations

Author: trnxdev

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = "zigd",
-    .version = "0.0.6",
+    .version = "0.0.7",
     .minimum_zig_version = "0.13.0",
     .paths = .{
         "build.zig",

src/utils.zig

@@ -99,3 +99,17 @@ pub fn exec(allocator: std.mem.Allocator, zig_binary: []const u8, args: [][:0]u8
     var proc = std.process.Child.init(argv, allocator);
     return try proc.spawnAndWait();
 }
+
+// Starts by 0! Clears the previouzs buffer
+pub fn join_path(buf: []u8, joins: []const []const u8) []const u8 {
+    var idx: usize = 0;
+
+    for (joins) |j| {
+        @memcpy(buf[idx .. idx + j.len], j);
+        idx += j.len;
+        buf[idx] = std.fs.path.sep;
+        idx += 1; // sep is usually one char
+    }
+
+    return buf[0..idx];
+}

src/zigd.version

@@ -1 +1 @@
-0.0.6
+0.0.7

src/zigdcli.zig

@@ -103,8 +103,8 @@ fn setup(allocator: std.mem.Allocator, args: []const []const u8, zigd_path: []co
         return;
     }
 
-    const config_path = try std.fs.path.join(allocator, &.{ zigd_path, "config" });
-    defer allocator.free(config_path);
+    var config_path_buf: zigdcore.PathBuf = undefined;
+    const config_path = utils.join_path(&config_path_buf, &.{ zigd_path, "config" });
 
     if (try utils.isFile(config_path)) {
         o: while (true) {
@@ -170,8 +170,8 @@ fn exists(allocator: std.mem.Allocator, args: []const []const u8, zigd_path: []c
     var zig_version = try zigdcore.ZigVersion.parse(allocator, args[2], &user_arg, false, zigd_path, true);
     defer zig_version.deinitIfMightBeAllocated(allocator);
 
-    const version_path = try std.fs.path.join(allocator, &.{ zigd_path, "versions", zig_version.as_string });
-    defer allocator.free(version_path);
+    var version_path_buf: zigdcore.PathBuf = undefined;
+    const version_path = utils.join_path(&version_path_buf, &.{ zigd_path, zigdcore.VersionsByZigd, zig_version.as_string });
 
     if (try utils.isDirectory(version_path)) {
         try std.io.getStdOut().writer().writeAll("Yes!\n");
@@ -184,8 +184,8 @@ fn recache_master(allocator: std.mem.Allocator, zigd_path: []const u8) !void {
     const master = try zigdcore.fetchMaster(allocator, zigd_path, false);
     defer allocator.free(master);
 
-    const cache_path = try zigdcore.getCachePath(allocator, zigd_path);
-    defer allocator.free(cache_path);
+    var cache_path_buf: zigdcore.PathBuf = undefined;
+    const cache_path = utils.join_path(&cache_path_buf, &.{ zigd_path, zigdcore.CacheByZigd });
 
     const cache_file = try zigdcore.getCacheFile(cache_path);
     defer cache_file.close();

src/zigdcore.zig

@@ -1,11 +1,17 @@
 const std = @import("std");
 const utils = @import("utils.zig");
 
+pub const PathBuf = [std.fs.MAX_PATH_BYTES]u8;
+
+pub const TempByZigd = "tmp";
+pub const CacheByZigd = "cached_master";
+pub const VersionsByZigd = "versions";
+
 /// Version cannot be master!
 /// Returns a bool if it installed/reinstalled zig
 pub fn install_zig(allocator: std.mem.Allocator, zigd_path: []const u8, download_url: []const u8, zig_version: ZigVersion) !bool {
-    const final_destination = try std.fs.path.join(allocator, &.{ zigd_path, "versions", zig_version.as_string });
-    defer allocator.free(final_destination);
+    var final_dest_buf: PathBuf = undefined;
+    const final_destination = utils.join_path(&final_dest_buf, &.{ zigd_path, VersionsByZigd, zig_version.as_string });
 
     if (try utils.isDirectory(final_destination)) {
         o: while (true) {
@@ -50,8 +56,8 @@ pub fn install_zig(allocator: std.mem.Allocator, zigd_path: []const u8, download
         return error.ResponseWasNotOk;
     }
 
-    const temp_dir_path = try std.fs.path.join(allocator, &.{ zigd_path, "tmp" });
-    defer allocator.free(temp_dir_path);
+    var temp_dir_buf: PathBuf = undefined;
+    const temp_dir_path = utils.join_path(&temp_dir_buf, &.{ zigd_path, "tmp" });
 
     try utils.createDirectoryIgnoreExist(temp_dir_path);
 
@@ -63,7 +69,7 @@ pub fn install_zig(allocator: std.mem.Allocator, zigd_path: []const u8, download
 
     var temp_storage_closed: bool = false;
     var temporary_storage = try temp_dir.makeOpenPath(temp_name, .{
-        .iterate = true,
+        .iterate = utils.os_tag == .windows,
     });
     errdefer if (!temp_storage_closed) temporary_storage.close();
 
@@ -88,7 +94,7 @@ pub fn install_zig(allocator: std.mem.Allocator, zigd_path: []const u8, download
         try temporary_storage.rename(w_path_duped, final_destination);
         temporary_storage.close();
         temp_storage_closed = true;
-        try std.fs.cwd().deleteDir(temp_name);
+        try temp_dir.deleteTree(temp_name);
     } else {
         var xz_decompressor = try std.compress.xz.decompress(allocator, req.reader());
         defer xz_decompressor.deinit();
@@ -104,7 +110,7 @@ pub fn install_zig(allocator: std.mem.Allocator, zigd_path: []const u8, download
 }
 
 pub fn getCachePath(allocator: std.mem.Allocator, zigd_path: []const u8) ![]u8 {
-    return try std.fs.path.join(allocator, &.{ zigd_path, "cached_master" });
+    return try std.fs.path.join(allocator, &.{ zigd_path, CacheByZigd });
 }
 
 pub fn getCacheFile(cache_path: []const u8) !std.fs.File {
@@ -292,14 +298,6 @@ pub fn getZigdPath(allocator: std.mem.Allocator) ![]u8 {
 
 // I'm bored, that's why im gonna do it the messy style
 pub fn garbage_collect_tempdir(zigd_path: []const u8) !void {
-    var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
-    var idx: usize = 0;
-    @memcpy(buf[0 .. idx + zigd_path.len], zigd_path);
-    idx += zigd_path.len;
-    buf[idx] = std.fs.path.sep;
-    idx += 1;
-    @memcpy(buf[idx .. idx + "tmp".len], "tmp");
-    idx += "tmp".len;
-
-    try std.fs.deleteTreeAbsolute(buf[0..idx]);
+    var buf: PathBuf = undefined;
+    try std.fs.deleteTreeAbsolute(utils.join_path(&buf, &.{ zigd_path, "tmp" }));
 }

src/zigdemu.zig

@@ -17,8 +17,8 @@ pub fn main() !void {
 
     try zigdcore.garbage_collect_tempdir(zigd_path);
 
-    const config_path = try std.fs.path.join(allocator, &.{ zigd_path, "config" });
-    defer allocator.free(config_path);
+    var config_path_dir: zigdcore.PathBuf = undefined;
+    const config_path = utils.join_path(&config_path_dir, &.{ zigd_path, "config" });
 
     var config = try Config.load_from(allocator, config_path);
     defer config.deinit();
@@ -67,8 +67,8 @@ pub fn main() !void {
     zig_version = try zigdcore.ZigVersion.parse(allocator, zig_version.as_string, &zig_version.source, true, zigd_path, true);
     defer zig_version.deinitIfMightBeAllocated(allocator);
 
-    const zig_binary_path = try std.fs.path.join(allocator, &.{ zigd_path, "versions", zig_version.as_string, "zig" ++ utils.binary_ext });
-    defer allocator.free(zig_binary_path);
+    var bin_path: zigdcore.PathBuf = undefined;
+    const zig_binary_path = utils.join_path(&bin_path, &.{ zigd_path, zigdcore.VersionsByZigd, zig_version.as_string, "zig" ++ utils.binary_ext });
 
     if (!(try utils.isFile(zig_binary_path))) o: {
         const zig_version_path = std.mem.lastIndexOfScalar(u8, zig_binary_path, std.fs.path.sep) orelse unreachable;