core: Remove unnecessary internal slice fields Those were there for easy access and release. However, manually reconstructing a slice from a pointer (and a length) is not tedious or difficult. 8 bytes to 24 bytes reduction per objects.

Changes

3 changed files (+24/-54)

• core/src/connection.zig
  • @@ -102,7 +102,6 @@ internal: *Internal,
    token: [*:0]const u8, pub const Internal = struct { - token: [:0]const u8, arc: Arc = .{}, };
  • @@ -111,9 +110,7 @@ pub fn make(token: [:0]const u8) std.mem.Allocator.Error!*ConnectedEvent {
    const internal = try allocator.create(Internal); errdefer allocator.destroy(internal); - internal.* = .{ - .token = token, - }; + internal.* = .{}; const self = try allocator.create(ConnectedEvent); errdefer allocator.destroy(self);
  • @@ -141,7 +138,7 @@ );
    if (self.internal.arc.unref()) { freelog(self); - allocator.free(self.internal.token); + allocator.free(std.mem.span(self.token)); allocator.destroy(self.internal); allocator.destroy(self); }
  • @@ -922,7 +919,7 @@ );
    return; }; - const req = kind.request(allocator, req_id, zone.internal.id) catch |err| { + const req = kind.request(allocator, req_id, std.mem.span(zone.id)) catch |err| { std.log.err("Unable to compose control request: {s}", .{@errorName(err)}); return; };
• core/src/discovery.zig
  • @@ -40,9 +40,6 @@ version: [*:0]const u8,
    http_port: u16, pub const Internal = struct { - id: [:0]const u8, - name: [:0]const u8, - version: [:0]const u8, address: std.net.Address, arc: Arc = .{}, };
  • @@ -67,9 +64,6 @@ var address = addr.*;
    address.setPort(resp.http_port); internal.* = .{ - .id = id, - .name = name, - .version = version, .address = address, };
  • @@ -102,9 +96,9 @@
    if (self.internal.arc.unref()) { freelog(self); - allocator.free(self.internal.id); - allocator.free(self.internal.name); - allocator.free(self.internal.version); + allocator.free(std.mem.span(self.id)); + allocator.free(std.mem.span(self.name)); + allocator.free(std.mem.span(self.version)); allocator.destroy(self.internal); allocator.destroy(self); }
  • @@ -115,13 +109,13 @@ pub fn jsonStringify(self: *const Server, jws: anytype) !void {
    try jws.beginObject(); try jws.objectField("unique_id"); - try jws.write(self.internal.id); + try jws.write(std.mem.span(self.id)); try jws.objectField("name"); - try jws.write(self.internal.name); + try jws.write(std.mem.span(self.name)); try jws.objectField("version"); - try jws.write(self.internal.version); + try jws.write(std.mem.span(self.version)); try jws.objectField("address"); try jws.print("\"{}\"", .{self.internal.address});
  • @@ -155,8 +149,6 @@ out_of_memory = 5,
    }; pub const Internal = struct { - servers: []*Server = &.{}, - arc: Arc = .{}, };
  • @@ -191,7 +183,6 @@ servers[i] = server.*.retain();
    i += 1; } - self.internal.servers = servers; self.servers_ptr = servers.ptr; self.servers_len = servers.len; }
  • @@ -202,7 +193,6 @@ errdefer allocator.free(servers);
    servers[0] = found.retain(); - self.internal.servers = servers; self.servers_ptr = servers.ptr; self.servers_len = 1; self.code = .ok;
  • @@ -226,10 +216,11 @@
    if (self.internal.arc.unref()) { freelog(self); - for (self.internal.servers) |server| { + const servers = self.servers_ptr[0..self.servers_len]; + for (servers) |server| { server.release(); } - allocator.free(self.internal.servers); + allocator.free(servers); allocator.destroy(self.internal); allocator.destroy(self); }
  • @@ -342,7 +333,7 @@ };
    var server = try Server.make(&response, &src); errdefer server.release(); - try servers.put(server.internal.id, server); + try servers.put(std.mem.span(server.id), server); } }
• core/src/transport.zig
  • @@ -221,9 +221,6 @@ playback: PlaybackState,
    allowed_action: Action, pub const Internal = struct { - id: [:0]const u8, - name: [:0]const u8, - arc: Arc = .{}, };
  • @@ -244,10 +241,7 @@
    const internal = try allocator.create(Internal); errdefer allocator.destroy(internal); - internal.* = .{ - .id = id, - .name = name, - }; + internal.* = .{}; const self = try allocator.create(Zone); errdefer allocator.destroy(self);
  • @@ -293,8 +287,8 @@
    if (self.now_playing) |now_playing| { now_playing.release(); } - allocator.free(self.internal.id); - allocator.free(self.internal.name); + allocator.free(std.mem.span(self.id)); + allocator.free(std.mem.span(self.name)); allocator.destroy(self.internal); allocator.destroy(self); }
  • @@ -321,10 +315,6 @@ seek_changes_ptr: [*]const *SeekChange,
    seek_changes_len: usize, pub const Internal = struct { - added_zones: []const *Zone, - changed_zones: []const *Zone, - removed_zone_ids: []const [*:0]const u8, - arc: Arc = .{}, };
  • @@ -391,11 +381,7 @@
    const internal = try allocator.create(Internal); errdefer allocator.destroy(internal); - internal.* = .{ - .added_zones = added_zones, - .changed_zones = changed_zones, - .removed_zone_ids = removed_zone_ids, - }; + internal.* = .{}; const self = try allocator.create(ZoneListEvent); errdefer allocator.destroy(self);
  • @@ -436,11 +422,7 @@
    const internal = try allocator.create(Internal); errdefer allocator.destroy(internal); - internal.* = .{ - .added_zones = added_zones, - .changed_zones = &.{}, - .removed_zone_ids = &.{}, - }; + internal.* = .{}; const self = try allocator.create(ZoneListEvent); errdefer allocator.destroy(self);
  • @@ -475,20 +457,20 @@ );
    if (self.internal.arc.unref()) { freelog(self); - for (self.internal.added_zones) |zone| { + for (self.added_zones_ptr[0..self.added_zones_len]) |zone| { zone.release(); } - allocator.free(self.internal.added_zones); + allocator.free(self.added_zones_ptr[0..self.added_zones_len]); - for (self.internal.changed_zones) |zone| { + for (self.changed_zones_ptr[0..self.changed_zones_len]) |zone| { zone.release(); } - allocator.free(self.internal.changed_zones); + allocator.free(self.changed_zones_ptr[0..self.changed_zones_len]); - for (self.internal.removed_zone_ids) |id| { + for (self.removed_zone_ids_ptr[0..self.removed_zone_ids_len]) |id| { allocator.free(std.mem.span(id)); } - allocator.free(self.internal.removed_zone_ids); + allocator.free(self.removed_zone_ids_ptr[0..self.removed_zone_ids_len]); for (self.seek_changes_ptr[0..self.seek_changes_len]) |change| { change.release();