From 6b4e6d2fa53c8cfae865356dcc780d9b49f7feae Mon Sep 17 00:00:00 2001 From: Alexandre Antonio Juca Date: Fri, 3 Jan 2025 12:48:52 +0100 Subject: [PATCH 1/3] feat: Display memory usage and and limit in both bytes and Kb for improved readability --- src/inspector/Inspector.zig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/inspector/Inspector.zig b/src/inspector/Inspector.zig index 7dd61c8a1..eae881ec4 100644 --- a/src/inspector/Inspector.zig +++ b/src/inspector/Inspector.zig @@ -285,6 +285,10 @@ fn setupLayout(self: *Inspector, dock_id_main: cimgui.c.ImGuiID) void { cimgui.c.igDockBuilderFinish(dock_id_main); } +fn bytesToKb(bytes: usize) usize { + return bytes / 1024; +} + fn renderScreenWindow(self: *Inspector) void { // Start our window. If we're collapsed we do nothing. defer cimgui.c.igEnd(); @@ -440,7 +444,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes", kitty_images.total_bytes); + cimgui.c.igText("%d bytes (%d KB)", kitty_images.total_bytes, bytesToKb(kitty_images.total_bytes)); } } @@ -452,7 +456,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes", kitty_images.total_limit); + cimgui.c.igText("%d bytes (%d KB)", kitty_images.total_limit, bytesToKb(kitty_images.total_limit)); } } @@ -518,7 +522,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes", pages.page_size); + cimgui.c.igText("%d bytes (%d KB)", pages.page_size, bytesToKb(pages.page_size)); } } @@ -530,7 +534,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes", pages.maxSize()); + cimgui.c.igText("%d bytes (%d KB)", pages.maxSize(), bytesToKb(pages.maxSize())); } } From 0599f73fac18217a7118437fd72e73a68c48098c Mon Sep 17 00:00:00 2001 From: Alexandre Antonio Juca Date: Sat, 4 Jan 2025 09:02:25 +0100 Subject: [PATCH 2/3] chore: use KiB notation for representing memory size --- src/inspector/Inspector.zig | 8 ++++---- src/inspector/page.zig | 2 +- src/inspector/utils.zig | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/inspector/Inspector.zig b/src/inspector/Inspector.zig index bcdef1b47..73d063125 100644 --- a/src/inspector/Inspector.zig +++ b/src/inspector/Inspector.zig @@ -441,7 +441,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KB)", kitty_images.total_bytes, utils.toKiloBytes(kitty_images.total_bytes)); + cimgui.c.igText("%d bytes (%d KiB)", kitty_images.total_bytes, utils.toKibiBytes(kitty_images.total_bytes)); } } @@ -453,7 +453,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KB)", kitty_images.total_limit, utils.toKiloBytes(kitty_images.total_limit)); + cimgui.c.igText("%d bytes (%d KiB)", kitty_images.total_limit, utils.toKibiBytes(kitty_images.total_limit)); } } @@ -519,7 +519,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KB)", pages.page_size, utils.toKiloBytes(pages.page_size)); + cimgui.c.igText("%d bytes (%d KiB)", pages.page_size, utils.toKibiBytes(pages.page_size)); } } @@ -531,7 +531,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KB)", pages.maxSize(), utils.toKiloBytes(pages.maxSize())); + cimgui.c.igText("%d bytes (%d KiB)", pages.maxSize(), utils.toKibiBytes(pages.maxSize())); } } diff --git a/src/inspector/page.zig b/src/inspector/page.zig index 2852b719e..c3ca93c5f 100644 --- a/src/inspector/page.zig +++ b/src/inspector/page.zig @@ -27,7 +27,7 @@ pub fn render(page: *const terminal.Page) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d Kb)", page.memory.len, utils.toKiloBytes(page.memory.len)); + cimgui.c.igText("%d bytes (%d KiB)", page.memory.len, utils.toKibiBytes(page.memory.len)); cimgui.c.igText("%d VM pages", page.memory.len / std.mem.page_size); } } diff --git a/src/inspector/utils.zig b/src/inspector/utils.zig index 87c617a23..28f928232 100644 --- a/src/inspector/utils.zig +++ b/src/inspector/utils.zig @@ -1,3 +1,3 @@ -pub fn toKiloBytes(bytes: usize) usize { +pub fn toKibiBytes(bytes: usize) usize { return bytes / 1024; } From 62fae29395b658b014b574623ae9c3eff61af91a Mon Sep 17 00:00:00 2001 From: Alexandre Antonio Juca Date: Sat, 4 Jan 2025 23:37:54 +0100 Subject: [PATCH 3/3] chore: rename file --- src/inspector/Inspector.zig | 10 +++++----- src/inspector/page.zig | 4 ++-- src/inspector/{utils.zig => units.zig} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename src/inspector/{utils.zig => units.zig} (100%) diff --git a/src/inspector/Inspector.zig b/src/inspector/Inspector.zig index 73d063125..54d49b088 100644 --- a/src/inspector/Inspector.zig +++ b/src/inspector/Inspector.zig @@ -14,7 +14,7 @@ const input = @import("../input.zig"); const renderer = @import("../renderer.zig"); const terminal = @import("../terminal/main.zig"); const inspector = @import("main.zig"); -const utils = @import("utils.zig"); +const units = @import("units.zig"); /// The window names. These are used with docking so we need to have access. const window_cell = "Cell"; @@ -441,7 +441,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KiB)", kitty_images.total_bytes, utils.toKibiBytes(kitty_images.total_bytes)); + cimgui.c.igText("%d bytes (%d KiB)", kitty_images.total_bytes, units.toKibiBytes(kitty_images.total_bytes)); } } @@ -453,7 +453,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KiB)", kitty_images.total_limit, utils.toKibiBytes(kitty_images.total_limit)); + cimgui.c.igText("%d bytes (%d KiB)", kitty_images.total_limit, units.toKibiBytes(kitty_images.total_limit)); } } @@ -519,7 +519,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KiB)", pages.page_size, utils.toKibiBytes(pages.page_size)); + cimgui.c.igText("%d bytes (%d KiB)", pages.page_size, units.toKibiBytes(pages.page_size)); } } @@ -531,7 +531,7 @@ fn renderScreenWindow(self: *Inspector) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KiB)", pages.maxSize(), utils.toKibiBytes(pages.maxSize())); + cimgui.c.igText("%d bytes (%d KiB)", pages.maxSize(), units.toKibiBytes(pages.maxSize())); } } diff --git a/src/inspector/page.zig b/src/inspector/page.zig index c3ca93c5f..bb95d59b9 100644 --- a/src/inspector/page.zig +++ b/src/inspector/page.zig @@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator; const cimgui = @import("cimgui"); const terminal = @import("../terminal/main.zig"); const inspector = @import("main.zig"); -const utils = @import("utils.zig"); +const units = @import("units.zig"); pub fn render(page: *const terminal.Page) void { cimgui.c.igPushID_Ptr(page); @@ -27,7 +27,7 @@ pub fn render(page: *const terminal.Page) void { } { _ = cimgui.c.igTableSetColumnIndex(1); - cimgui.c.igText("%d bytes (%d KiB)", page.memory.len, utils.toKibiBytes(page.memory.len)); + cimgui.c.igText("%d bytes (%d KiB)", page.memory.len, units.toKibiBytes(page.memory.len)); cimgui.c.igText("%d VM pages", page.memory.len / std.mem.page_size); } } diff --git a/src/inspector/utils.zig b/src/inspector/units.zig similarity index 100% rename from src/inspector/utils.zig rename to src/inspector/units.zig