Skip to content

feat: メモリ使用量を軽量化 #5

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
midasdf merged 2 commits into from
Mar 27, 2026
Merged

feat: メモリ使用量を軽量化 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e4b021
feat: メモリ使用量を軽量化
claude Mar 27, 2026
4d2fdbb
feat: リリースビルドでstrip/single_threaded有効化（RSS数MB削減）
claude Mar 27, 2026
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
10 changes: 10 additions & 0 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ const std = @import("std");
pub fn build(b: *std.Build) void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});
// リリースビルド時はデバッグシンボルを除去しRSS数MB削減
const strip: ?bool = if (optimize != .Debug) true else null;
// WMは単一スレッド。TLS・mutex不要。
const single_threaded: ?bool = if (optimize != .Debug) true else null;

// Shared modules
const ipc_mod = b.createModule(.{
Expand All @@ -18,6 +22,8 @@ pub fn build(b: *std.Build) void {
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
.strip = strip,
.single_threaded = single_threaded,
}),
});
zephwm_exe.linkSystemLibrary("xcb");
Expand All @@ -36,6 +42,8 @@ pub fn build(b: *std.Build) void {
.root_source_file = b.path("zephwm-msg/main.zig"),
.target = target,
.optimize = optimize,
.strip = strip,
.single_threaded = single_threaded,
.imports = &.{
.{ .name = "ipc", .module = ipc_mod },
},
Expand All @@ -61,6 +69,8 @@ pub fn build(b: *std.Build) void {
.root_source_file = b.path("zephwm-bar/main.zig"),
.target = target,
.optimize = optimize,
.strip = strip,
.single_threaded = single_threaded,
.imports = &.{
.{ .name = "ipc", .module = ipc_mod },
.{ .name = "builtin_status", .module = builtin_status_mod },
Expand Down
144 changes: 82 additions & 62 deletions src/config.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,39 @@ pub const Config = struct {
focused_inactive_bg: []const u8 = "#5f676a",
focused_inactive_text: []const u8 = "#ffffff",
hide_edge_borders: HideEdgeBorders = .none,
focused_border_owned: bool = false,
focused_bg_owned: bool = false,
focused_text_owned: bool = false,
unfocused_border_owned: bool = false,
unfocused_bg_owned: bool = false,
unfocused_text_owned: bool = false,
focused_inactive_border_owned: bool = false,
focused_inactive_bg_owned: bool = false,
focused_inactive_text_owned: bool = false,
// Bitmask tracking which string fields are heap-allocated (must free on deinit)
const OwnedFlag = enum(u16) {
focused_border = 1 << 0,
focused_bg = 1 << 1,
focused_text = 1 << 2,
unfocused_border = 1 << 3,
unfocused_bg = 1 << 4,
unfocused_text = 1 << 5,
focused_inactive_border = 1 << 6,
focused_inactive_bg = 1 << 7,
focused_inactive_text = 1 << 8,
bar_status_command = 1 << 9,
bar_position = 1 << 10,
bar_font = 1 << 11,
bar_bg_color = 1 << 12,
bar_statusline_color = 1 << 13,
};
owned: u16 = 0,

fn isOwned(self: *const Config, flag: OwnedFlag) bool {
return (self.owned & @intFromEnum(flag)) != 0;
}

fn setOwned(self: *Config, flag: OwnedFlag) void {
self.owned |= @intFromEnum(flag);
}

fn freeIfOwned(self: *Config, flag: OwnedFlag, ptr: []const u8) void {
if (self.isOwned(flag)) self.allocator.free(ptr);
}

// Bar
bar: BarConfig = .{},
bar_status_command_owned: bool = false,
bar_position_owned: bool = false,
bar_font_owned: bool = false,
bar_bg_color_owned: bool = false,
bar_statusline_color_owned: bool = false,
// Rules
window_rules: ArrayListManaged(WindowRule),
assign_rules: ArrayListManaged(AssignRule),
Expand All @@ -99,9 +116,6 @@ pub const Config = struct {
workspace_outputs: ArrayListManaged(WorkspaceOutput),
// Mode names (known modes besides "default")
modes: StringHashMapManaged(void),
// Raw config text (owned copy)
raw_text: []const u8,

pub fn parse(allocator: Allocator, text: []const u8) !Config {
var cfg = Config{
.allocator = allocator,
Expand All @@ -113,7 +127,6 @@ pub const Config = struct {
.exec_always_cmds = ArrayListManaged([]const u8).init(allocator),
.workspace_outputs = ArrayListManaged(WorkspaceOutput).init(allocator),
.modes = StringHashMapManaged(void).init(allocator),
.raw_text = try allocator.dupe(u8, text),
};
errdefer cfg.deinit();

Expand Down Expand Up @@ -151,34 +164,34 @@ pub const Config = struct {
// Inside bar colors block
if (in_bar_colors) {
if (std.mem.startsWith(u8, line, "background ")) {
if (cfg.bar_bg_color_owned) cfg.allocator.free(cfg.bar.bg_color);
cfg.freeIfOwned(.bar_bg_color, cfg.bar.bg_color);
cfg.bar.bg_color = try allocator.dupe(u8, std.mem.trim(u8, line["background ".len..], " \t"));
cfg.bar_bg_color_owned = true;
cfg.setOwned(.bar_bg_color);
} else if (std.mem.startsWith(u8, line, "statusline ")) {
if (cfg.bar_statusline_color_owned) cfg.allocator.free(cfg.bar.statusline_color);
cfg.freeIfOwned(.bar_statusline_color, cfg.bar.statusline_color);
cfg.bar.statusline_color = try allocator.dupe(u8, std.mem.trim(u8, line["statusline ".len..], " \t"));
cfg.bar_statusline_color_owned = true;
cfg.setOwned(.bar_statusline_color);
}
continue;
}

// Inside bar block
if (in_bar) {
if (std.mem.startsWith(u8, line, "status_command ")) {
if (cfg.bar_status_command_owned) cfg.allocator.free(cfg.bar.status_command);
cfg.freeIfOwned(.bar_status_command, cfg.bar.status_command);
cfg.bar.status_command = try allocator.dupe(u8, std.mem.trim(u8, line["status_command ".len..], " \t"));
cfg.bar_status_command_owned = true;
cfg.setOwned(.bar_status_command);
} else if (std.mem.startsWith(u8, line, "position ")) {
if (cfg.bar_position_owned) cfg.allocator.free(cfg.bar.position);
cfg.freeIfOwned(.bar_position, cfg.bar.position);
cfg.bar.position = try allocator.dupe(u8, std.mem.trim(u8, line["position ".len..], " \t"));
cfg.bar_position_owned = true;
cfg.setOwned(.bar_position);
} else if (std.mem.startsWith(u8, line, "height ")) {
const raw = std.mem.trim(u8, line["height ".len..], " \t");
cfg.bar.height = std.fmt.parseInt(u16, raw, 10) catch cfg.bar.height;
} else if (std.mem.startsWith(u8, line, "font ")) {
if (cfg.bar_font_owned) cfg.allocator.free(cfg.bar.font);
cfg.freeIfOwned(.bar_font, cfg.bar.font);
cfg.bar.font = try allocator.dupe(u8, std.mem.trim(u8, line["font ".len..], " \t"));
cfg.bar_font_owned = true;
cfg.setOwned(.bar_font);
} else if (std.mem.startsWith(u8, line, "colors {") or std.mem.eql(u8, line, "colors {")) {
in_bar_colors = true;
}
Expand Down Expand Up @@ -398,19 +411,19 @@ pub const Config = struct {
const rest = std.mem.trim(u8, line["client.focused ".len..], " \t");
var tok_iter = std.mem.tokenizeScalar(u8, rest, ' ');
if (tok_iter.next()) |border| {
if (cfg.focused_border_owned) cfg.allocator.free(cfg.focused_border);
cfg.freeIfOwned(.focused_border, cfg.focused_border);
cfg.focused_border = try allocator.dupe(u8, border);
cfg.focused_border_owned = true;
cfg.setOwned(.focused_border);
}
if (tok_iter.next()) |bg| {
if (cfg.focused_bg_owned) cfg.allocator.free(cfg.focused_bg);
cfg.freeIfOwned(.focused_bg, cfg.focused_bg);
cfg.focused_bg = try allocator.dupe(u8, bg);
cfg.focused_bg_owned = true;
cfg.setOwned(.focused_bg);
}
if (tok_iter.next()) |text_col| {
if (cfg.focused_text_owned) cfg.allocator.free(cfg.focused_text);
cfg.freeIfOwned(.focused_text, cfg.focused_text);
cfg.focused_text = try allocator.dupe(u8, text_col);
cfg.focused_text_owned = true;
cfg.setOwned(.focused_text);
}
continue;
}
Expand All @@ -420,19 +433,19 @@ pub const Config = struct {
const rest = std.mem.trim(u8, line["client.unfocused ".len..], " \t");
var tok_iter = std.mem.tokenizeScalar(u8, rest, ' ');
if (tok_iter.next()) |border| {
if (cfg.unfocused_border_owned) cfg.allocator.free(cfg.unfocused_border);
cfg.freeIfOwned(.unfocused_border, cfg.unfocused_border);
cfg.unfocused_border = try allocator.dupe(u8, border);
cfg.unfocused_border_owned = true;
cfg.setOwned(.unfocused_border);
}
if (tok_iter.next()) |bg| {
if (cfg.unfocused_bg_owned) cfg.allocator.free(cfg.unfocused_bg);
cfg.freeIfOwned(.unfocused_bg, cfg.unfocused_bg);
cfg.unfocused_bg = try allocator.dupe(u8, bg);
cfg.unfocused_bg_owned = true;
cfg.setOwned(.unfocused_bg);
}
if (tok_iter.next()) |text_col| {
if (cfg.unfocused_text_owned) cfg.allocator.free(cfg.unfocused_text);
cfg.freeIfOwned(.unfocused_text, cfg.unfocused_text);
cfg.unfocused_text = try allocator.dupe(u8, text_col);
cfg.unfocused_text_owned = true;
cfg.setOwned(.unfocused_text);
}
continue;
}
Expand All @@ -442,19 +455,19 @@ pub const Config = struct {
const rest = std.mem.trim(u8, line["client.focused_inactive ".len..], " \t");
var tok_iter = std.mem.tokenizeScalar(u8, rest, ' ');
if (tok_iter.next()) |border| {
if (cfg.focused_inactive_border_owned) cfg.allocator.free(cfg.focused_inactive_border);
cfg.freeIfOwned(.focused_inactive_border, cfg.focused_inactive_border);
cfg.focused_inactive_border = try allocator.dupe(u8, border);
cfg.focused_inactive_border_owned = true;
cfg.setOwned(.focused_inactive_border);
}
if (tok_iter.next()) |bg| {
if (cfg.focused_inactive_bg_owned) cfg.allocator.free(cfg.focused_inactive_bg);
cfg.freeIfOwned(.focused_inactive_bg, cfg.focused_inactive_bg);
cfg.focused_inactive_bg = try allocator.dupe(u8, bg);
cfg.focused_inactive_bg_owned = true;
cfg.setOwned(.focused_inactive_bg);
}
if (tok_iter.next()) |text_col| {
if (cfg.focused_inactive_text_owned) cfg.allocator.free(cfg.focused_inactive_text);
cfg.freeIfOwned(.focused_inactive_text, cfg.focused_inactive_text);
cfg.focused_inactive_text = try allocator.dupe(u8, text_col);
cfg.focused_inactive_text_owned = true;
cfg.setOwned(.focused_inactive_text);
}
continue;
}
Expand All @@ -480,6 +493,14 @@ pub const Config = struct {
// Unknown lines: silently skip
}

// パース完了後、余分なcapacityを解放
cfg.keybinds.shrinkAndFree(cfg.keybinds.items.len);
cfg.window_rules.shrinkAndFree(cfg.window_rules.items.len);
cfg.assign_rules.shrinkAndFree(cfg.assign_rules.items.len);
cfg.exec_cmds.shrinkAndFree(cfg.exec_cmds.items.len);
cfg.exec_always_cmds.shrinkAndFree(cfg.exec_always_cmds.items.len);
cfg.workspace_outputs.shrinkAndFree(cfg.workspace_outputs.items.len);
Comment on lines +497 to +502

@gemini-code-assist gemini-code-assist Bot Mar 27, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

これらのArrayListと同様に、variablesとmodesのHashMapに対してもshrinkAndFreeを呼び出すことで、さらにメモリ使用量を削減できる可能性があります。特に、設定ファイルによってはvariablesが多くなることも考えられるため、この最適化は有効だと思われます。

        cfg.keybinds.shrinkAndFree(cfg.keybinds.items.len);
        cfg.window_rules.shrinkAndFree(cfg.window_rules.items.len);
        cfg.assign_rules.shrinkAndFree(cfg.assign_rules.items.len);
        cfg.exec_cmds.shrinkAndFree(cfg.exec_cmds.items.len);
        cfg.exec_always_cmds.shrinkAndFree(cfg.exec_always_cmds.items.len);
        cfg.workspace_outputs.shrinkAndFree(cfg.workspace_outputs.items.len);
        cfg.variables.shrinkAndFree(cfg.variables.count());
        cfg.modes.shrinkAndFree(cfg.modes.count());


return cfg;
}

Expand Down Expand Up @@ -542,22 +563,21 @@ pub const Config = struct {
}
self.modes.deinit();

// Free owned color strings
if (self.focused_border_owned) self.allocator.free(self.focused_border);
if (self.focused_bg_owned) self.allocator.free(self.focused_bg);
if (self.focused_text_owned) self.allocator.free(self.focused_text);
if (self.unfocused_border_owned) self.allocator.free(self.unfocused_border);
if (self.unfocused_bg_owned) self.allocator.free(self.unfocused_bg);
if (self.unfocused_text_owned) self.allocator.free(self.unfocused_text);

// Free owned bar strings
if (self.bar_status_command_owned) self.allocator.free(self.bar.status_command);
if (self.bar_position_owned) self.allocator.free(self.bar.position);
if (self.bar_bg_color_owned) self.allocator.free(self.bar.bg_color);
if (self.bar_statusline_color_owned) self.allocator.free(self.bar.statusline_color);
if (self.bar_font_owned) self.allocator.free(self.bar.font);

self.allocator.free(self.raw_text);
// Free owned color and bar strings via bitmask
self.freeIfOwned(.focused_border, self.focused_border);
self.freeIfOwned(.focused_bg, self.focused_bg);
self.freeIfOwned(.focused_text, self.focused_text);
self.freeIfOwned(.unfocused_border, self.unfocused_border);
self.freeIfOwned(.unfocused_bg, self.unfocused_bg);
self.freeIfOwned(.unfocused_text, self.unfocused_text);
self.freeIfOwned(.focused_inactive_border, self.focused_inactive_border);
self.freeIfOwned(.focused_inactive_bg, self.focused_inactive_bg);
self.freeIfOwned(.focused_inactive_text, self.focused_inactive_text);
self.freeIfOwned(.bar_status_command, self.bar.status_command);
self.freeIfOwned(.bar_position, self.bar.position);
self.freeIfOwned(.bar_font, self.bar.font);
self.freeIfOwned(.bar_bg_color, self.bar.bg_color);
self.freeIfOwned(.bar_statusline_color, self.bar.statusline_color);
}
};

Expand Down
11 changes: 8 additions & 3 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,12 @@ fn handleIpcMessage(ctx: *event.EventContext, client_fd: std.posix.fd_t, msg_typ
};

ipc.writeResponse(client_fd, msg_type, response) catch {};

// Free dynamic tree JSON buffer after sending (it grows unbounded otherwise)
if (msg_type == @intFromEnum(ipc.MessageType.get_tree)) {
tree_json_buf.deinit(ctx.allocator);
tree_json_buf = .empty;
}
}

/// Build JSON for GET_WORKSPACES response.
Expand Down Expand Up @@ -522,9 +528,8 @@ fn parseColor(color_str: []const u8) u32 {
}

pub fn main() !void {
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
defer _ = gpa.deinit();
const allocator = gpa.allocator();
// GPAはアロケーション毎に~32Bのメタデータを持つ。libc mallocで軽量化。
const allocator = std.heap.c_allocator;

// Parse args: --version, --help
var args = std.process.args();
Expand Down
Loading