Skip to content

Commit

Permalink
pmdaresctrl: add indom help text for LLC
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
natoscott committed Nov 2, 2023
1 parent d0bbdc5 commit bdb8059
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 0 additions & 1 deletion qa/655.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
QA output created by 655

=== resctrl agent installation ===
newhelp: [<stdin>:33] RPM.0: Unknown metric name, entry abandoned
Updating the Performance Metrics Name Space (PMNS) ...
Terminate PMDA if already installed ...
[...install files, make output...]
Expand Down
2 changes: 2 additions & 0 deletions src/pmdas/resctrl/help
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/pmdas/resctrl/resctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit bdb8059

Please sign in to comment.