[lxc/lxc] d80b6b: tools: lxc-top: refactor lxc-top stat structs

0 views
Skip to first unread message

Stéphane Graber

unread,
May 15, 2026, 10:12:44 AM (4 days ago) May 15
to lxc-...@lists.linuxcontainers.org
Branch: refs/heads/main
Home: https://github.com/lxc/lxc
Commit: d80b6bf16043b9be9d93e47fe21baa8953b9f5f7
https://github.com/lxc/lxc/commit/d80b6bf16043b9be9d93e47fe21baa8953b9f5f7
Author: Natanael Copa <nc...@alpinelinux.org>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
tools: lxc-top: refactor lxc-top stat structs

Create separate structs for each controller class. This will make it
easier to add cgroupv2 support.

No functional changes.

Signed-off-by: Natanael Copa <nc...@alpinelinux.org>


Commit: 46ad85a59f1f96001d524ed008261eab48b1242a
https://github.com/lxc/lxc/commit/46ad85a59f1f96001d524ed008261eab48b1242a
Author: Natanael Copa <nc...@alpinelinux.org>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
tools: lxc-top: get memory stats from cgroups2

Signed-off-by: Natanael Copa <nc...@alpinelinux.org>


Commit: 25b8560529a5e8a27582537415af5bfff5b8ad74
https://github.com/lxc/lxc/commit/25b8560529a5e8a27582537415af5bfff5b8ad74
Author: Natanael Copa <nc...@alpinelinux.org>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
lxc-top: CPU stats for cgroups2

Recalculate the usec to nanoseconds and USER_HZ

Signed-off-by: Natanael Copa <nc...@alpinelinux.org>


Commit: 54bebd3b5f3209698f6727bd620e06c1880fb929
https://github.com/lxc/lxc/commit/54bebd3b5f3209698f6727bd620e06c1880fb929
Author: Natanael Copa <nc...@alpinelinux.org>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
tools: lxc-top: get the user HZ at runtime

The USER_HZ depends on the kernel configuration. Get it run-time instead
of assume it is 100 HZ.

Signed-off-by: Natanael Copa <nc...@alpinelinux.org>


Commit: 1722580c9872aae2589c4ff5d18e54cacab815a7
https://github.com/lxc/lxc/commit/1722580c9872aae2589c4ff5d18e54cacab815a7
Author: Natanael Copa <nc...@alpinelinux.org>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
tools: lxc-top: add cgroups2 IO stats

Signed-off-by: Natanael Copa <nc...@alpinelinux.org>


Commit: 0ef8abe9fa7950f4889ea36919a3f1a01f171191
https://github.com/lxc/lxc/commit/0ef8abe9fa7950f4889ea36919a3f1a01f171191
Author: Devon Schwartz <devon.s....@gmail.com>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
lxc-top: added kernel memory usage for cgroup2

Signed-off-by: Devon Schwartz <devon.s....@gmail.com>


Commit: 5aef4b9e9349b5deee68ddc949c381eb1c58ce6e
https://github.com/lxc/lxc/commit/5aef4b9e9349b5deee68ddc949c381eb1c58ce6e
Author: Devon Schwartz <devon.s....@gmail.com>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
tools: lxc-top: add batch as conditional because ct_print_cnt irrelevant for lxc-top -b

Signed-off-by: Devon Schwartz <devon.s....@gmail.com>


Commit: 1f552e114b1f4a9c1d2435a0058e1ba05e6785b2
https://github.com/lxc/lxc/commit/1f552e114b1f4a9c1d2435a0058e1ba05e6785b2
Author: Devon Schwartz <devon.s....@gmail.com>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
tools: lxc-top: print when batch or less than container count

Signed-off-by: Devon Schwartz <devon.s....@gmail.com>


Commit: 997683582d7905a89e4750b95700fc472657c693
https://github.com/lxc/lxc/commit/997683582d7905a89e4750b95700fc472657c693
Author: Devon Schwartz <devon.s....@gmail.com>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
tools: lxc-top: add union to cgroup1 memsw and cgroup2 swap stats

Signed-off-by: Devon Schwartz <devon.s....@gmail.com>


Commit: 5aab9c590f30b51bcd1bd682a4116ad8a82c1e41
https://github.com/lxc/lxc/commit/5aab9c590f30b51bcd1bd682a4116ad8a82c1e41
Author: Stéphane Graber <stgr...@stgraber.org>
Date: 2026-05-15 (Fri, 15 May 2026)

Changed paths:
M src/lxc/tools/lxc_top.c

Log Message:
-----------
Merge pull request #4439 from DevonSchwartz/fix-lxc-top-cgroup2

Fixed cgroup2 path issue in LXC-Top


Compare: https://github.com/lxc/lxc/compare/b0ff3f2eaac2...5aab9c590f30

To unsubscribe from these emails, change your notification settings at https://github.com/lxc/lxc/settings/notifications
Reply all
Reply to author
Forward
0 new messages