From 0b759b1f1f85a86d745928dadf81d5ed63c70208 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Tue, 27 Feb 2024 10:44:57 +1100 Subject: [PATCH] pmdalinux: remove spurious init-to-zero in hugepage metrics, fix QA --- qa/1788.out | 69 ++++++++++++++++++++++++++++++- src/pmdas/linux/sysfs_hugepages.c | 1 - 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/qa/1788.out b/qa/1788.out index ea402996be..d5d0444301 100644 --- a/qa/1788.out +++ b/qa/1788.out @@ -1,2 +1,69 @@ QA output created by 1788 -[skeleton from qa/new, replace me] +== Checking hugepages metric values - sysfs-hugepages-001.tgz + +mem.hugepages.free + inst [0 or "2048kB"] value 0 + inst [1 or "32768kB"] value 327680 + inst [2 or "64kB"] value 0 + inst [3 or "1048576kB"] value 0 + +mem.hugepages.overcommit + inst [0 or "2048kB"] value 0 + inst [1 or "32768kB"] value 0 + inst [2 or "64kB"] value 0 + inst [3 or "1048576kB"] value 0 + +mem.hugepages.pagesize + inst [0 or "2048kB"] value 2048 + inst [1 or "32768kB"] value 32768 + inst [2 or "64kB"] value 64 + inst [3 or "1048576kB"] value 1048576 + +mem.hugepages.reserved + inst [0 or "2048kB"] value 0 + inst [1 or "32768kB"] value 0 + inst [2 or "64kB"] value 0 + inst [3 or "1048576kB"] value 0 + +mem.hugepages.surplus + inst [0 or "2048kB"] value 8192 + inst [1 or "32768kB"] value 0 + inst [2 or "64kB"] value 5760 + inst [3 or "1048576kB"] value 0 + +mem.hugepages.totalsize + inst [0 or "2048kB"] value 8192 + inst [1 or "32768kB"] value 327680 + inst [2 or "64kB"] value 6400 + inst [3 or "1048576kB"] value 0 + +== done + +== Checking hugepages metric values - sysfs-hugepages-002.tgz + +mem.hugepages.free + inst [0 or "2048kB"] value 4096000 + inst [3 or "1048576kB"] value 104857600 + +mem.hugepages.overcommit + inst [0 or "2048kB"] value 0 + inst [3 or "1048576kB"] value 0 + +mem.hugepages.pagesize + inst [0 or "2048kB"] value 2048 + inst [3 or "1048576kB"] value 1048576 + +mem.hugepages.reserved + inst [0 or "2048kB"] value 16384 + inst [3 or "1048576kB"] value 0 + +mem.hugepages.surplus + inst [0 or "2048kB"] value 8192 + inst [3 or "1048576kB"] value 0 + +mem.hugepages.totalsize + inst [0 or "2048kB"] value 4096000 + inst [3 or "1048576kB"] value 104857600 + +== done + diff --git a/src/pmdas/linux/sysfs_hugepages.c b/src/pmdas/linux/sysfs_hugepages.c index 09314bc07f..794813fd91 100644 --- a/src/pmdas/linux/sysfs_hugepages.c +++ b/src/pmdas/linux/sysfs_hugepages.c @@ -103,7 +103,6 @@ refresh_sysfs_hugepages(pmInDom indom) for (i=0; i < HUGEPAGES_METRIC_COUNT; i++) { if (strncmp(hugepage_fields[i], h, hlen) == 0) { hugepage->values[i] = strtoull(strvalue, NULL, 0); - hugepage->values[i] = 0; break; } }