From bdb80591e446e94d64a6931b5cf981d763d4ec43 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 2 Nov 2023 11:17:51 +1100 Subject: [PATCH] pmdaresctrl: add indom help text for LLC Drop a leftover in the expected QA test output for resctrl, and use latest PMDA interface (this PMDA only uses the fetch callback, this'll be fine as long as that remains the case). Also name the default PMDA log file with the updated name. --- qa/655.out | 1 - src/pmdas/resctrl/help | 2 ++ src/pmdas/resctrl/resctrl.c | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qa/655.out b/qa/655.out index 1a69baeffd..ac201f7a20 100644 --- a/qa/655.out +++ b/qa/655.out @@ -1,7 +1,6 @@ QA output created by 655 === resctrl agent installation === -newhelp: [:33] RPM.0: Unknown metric name, entry abandoned Updating the Performance Metrics Name Space (PMNS) ... Terminate PMDA if already installed ... [...install files, make output...] diff --git a/src/pmdas/resctrl/help b/src/pmdas/resctrl/help index 72766bc75b..b7585f1608 100644 --- a/src/pmdas/resctrl/help +++ b/src/pmdas/resctrl/help @@ -27,6 +27,8 @@ # blank lines before the @ line are ignored # +@ 159.0 set of last level caches (LLC) + @ resctrl.llc.occupancy % of LLC in use @ resctrl.llc.mbm_local local memory bandwidth of this LLC @ resctrl.llc.mbm_total total memory bandwidth of this LLC diff --git a/src/pmdas/resctrl/resctrl.c b/src/pmdas/resctrl/resctrl.c index 9c4db36937..53e469c5e9 100644 --- a/src/pmdas/resctrl/resctrl.c +++ b/src/pmdas/resctrl/resctrl.c @@ -248,7 +248,7 @@ resctrl_init(pmdaInterface *dp) int sep = pmPathSeparator(); pmsprintf(mypath, sizeof(mypath), "%s%c" "resctrl" "%c" "help", pmGetConfig("PCP_PMDAS_DIR"), sep, sep); - pmdaDSO(dp, PMDA_INTERFACE_6, "llc DSO", mypath); + pmdaDSO(dp, PMDA_INTERFACE_LATEST, "resctrl DSO", mypath); } else { pmSetProcessIdentity(username); } @@ -279,8 +279,8 @@ main(int argc, char **argv) pmsprintf(mypath, sizeof(mypath), "%s%c" "resctrl" "%c" "help", pmGetConfig("PCP_PMDAS_DIR"), sep, sep); - pmdaDaemon(&dispatch, PMDA_INTERFACE_6, pmGetProgname(), RESCTRL, - "llc.log", mypath); + pmdaDaemon(&dispatch, PMDA_INTERFACE_LATEST, pmGetProgname(), RESCTRL, + "resctrl.log", mypath); pmdaGetOptions(argc, argv, &opts, &dispatch); if (opts.errors) {