Compare commits

...

2 Commits

Author SHA1 Message Date
813f25ccc8 Use proper ids 2025-03-23 04:25:24 -07:00
0e70d496a0 Patch for missing cpu model from /proc/cpuinfo 2025-03-23 04:02:19 -07:00
2 changed files with 39 additions and 0 deletions

View File

@@ -53,6 +53,8 @@ struct _glibtop_sysinfo
glibtop_entry cpuinfo [GLIBTOP_NCPU];
};
const char *decode_cpu_part(unsigned int part);
#define glibtop_get_sysinfo_r glibtop_get_sysinfo_s
const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);

View File

@@ -33,6 +33,27 @@ static const unsigned long _glibtop_sysdeps_sysinfo =
static glibtop_sysinfo sysinfo = { .flags = 0 };
/* Lookup table for CPU part decoding */
static const struct {
unsigned int part;
const char *model;
} cpu_part_lookup[] = {
{ 0xd03, "Cortex-A53" }, // Raspberry Pi 3 (BCM2837)
{ 0xd08, "Cortex-A72" }, // Raspberry Pi 4 (BCM2711)
{ 0xd0b, "Cortex-A76" }, // Raspberry Pi 5 (BCM2712)
{ 0x0000, "Unknown" } // Default fallback
};
/* Function to decode CPU part */
const char *decode_cpu_part(unsigned int part) {
for (int i = 0; cpu_part_lookup[i].part != 0x0000; i++) {
if (cpu_part_lookup[i].part == part) {
return cpu_part_lookup[i].model;
}
}
return "Unknown";
}
static void
init_sysinfo (glibtop *server)
{
@@ -77,6 +98,9 @@ init_sysinfo (glibtop *server)
/* "<key> : <value>" */
parts = g_strsplit_set(*this_proc, ":\n", 0);
unsigned int cpu_part = 0;
gboolean has_model = FALSE;
for(p = parts; *p && *(p+1); p += 2) {
/* stole the allocated memory */
@@ -85,8 +109,21 @@ init_sysinfo (glibtop *server)
g_ptr_array_add(cpuinfo->labels, key);
g_hash_table_insert(cpuinfo->values, key, value);
/* Extract CPU part */
if (g_strcmp0(key, "CPU part") == 0) {
cpu_part = strtoul(value, NULL, 16);
}
if (g_strcmp0(key, "model name") == 0) {
has_model = TRUE;
}
}
/* If model name is missing, add it */
if (!has_model && cpu_part != 0) {
const char *decoded_model = decode_cpu_part(cpu_part);
g_hash_table_insert(cpuinfo->values, g_strdup("model name"), g_strdup(decoded_model));
}
/* the last key has no value and has not been added */
if(*p) g_free(*p);