From 058b190a819bd461d22677e1c4c1047beb7f0364 Mon Sep 17 00:00:00 2001 From: Michael Mueller Date: Tue, 11 Mar 2025 13:57:29 +0100 Subject: [PATCH] base-tukija: Fixed Cpuset::count() reporting wrong number of CPUs. Also changed print() to output correct JSON. --- repos/base-tukija/include/tukija/syscall-generic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/base-tukija/include/tukija/syscall-generic.h b/repos/base-tukija/include/tukija/syscall-generic.h index 5f4ce1c7a8..004dd3d109 100644 --- a/repos/base-tukija/include/tukija/syscall-generic.h +++ b/repos/base-tukija/include/tukija/syscall-generic.h @@ -183,7 +183,7 @@ namespace Tukija { unsigned count() { unsigned count = 0; - for (unsigned i = 0; i < sizeof(raw); i++) { + for (unsigned i = 0; i < sizeof(raw) / sizeof(raw[0]); i++) { count += static_cast(popcount(raw[i])); } return count; @@ -1325,9 +1325,9 @@ namespace Genode { } static inline void print(Output &out, Tukija::Cpuset &cpus) { - print(out, "CPUs [ "); + print(out, "[ "); cpus.for_each([&](long cpu) - { print(out, cpu, " "); }); + { print(out, cpu, ", "); }); print(out, "]"); }