Merge branch 'main' of https://github.com/performancecopilot/pcp

performancecopilot · Nov 2, 2023 · 20553b8 · 20553b8
2 parents 1253363 + bdb8059
commit 20553b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/qa/655.out b/qa/655.out
@@ -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...]

diff --git 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
@@ -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) {