Skip to content

Commit 644a872

Browse files
christianhornchristianhorn
committed
Update testcase 1653, custom rootpath fix
1 parent 67c2cc0 commit 644a872

File tree

2 files changed

+64
-57
lines changed

2 files changed

+64
-57
lines changed

‎qa/1653.out

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,41 @@ QA output created by 1653
88
Updating the Performance Metrics Name Space (PMNS) ...
99
Terminate PMDA if already installed ...
1010
Updating the PMCD control file, and notifying PMCD ...
11-
Check denki metrics have appeared ... 4 metrics and 4 values
11+
Check denki metrics have appeared ... 5 metrics and 4 values
1212

13-
denki.rapl
13+
denki.raplsysfs
1414
Data Type: 64-bit unsigned int InDom: 156.0 0x27000000
1515
Semantics: counter Units: none
16-
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
17-
inst [0 or "0-package-1"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
18-
inst [1 or "0-core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
19-
inst [2 or "1-package-0"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
20-
inst [3 or "1-core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
16+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
17+
inst [0 or "0-package-1"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
18+
inst [1 or "0-core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
19+
inst [2 or "1-package-0"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
20+
inst [3 or "1-core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
2121
inst [2 or "1-package-0"] value 13719
2222
inst [1 or "0-core"] value 3483
2323
inst [3 or "1-core"] value 8334
2424
inst [0 or "0-package-1"] value 8826
2525

26+
denki.raplmsr
27+
Data Type: 64-bit unsigned int InDom: 156.1 0x27000001
28+
Semantics: counter Units: none
29+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplmsr","machineid":"MACHINEID","userid":USERID}
30+
No value(s) available!
31+
2632
denki.bat.energy_now
27-
Data Type: double InDom: 156.1 0x27000001
33+
Data Type: double InDom: 156.2 0x27000002
2834
Semantics: instant Units: none
2935
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
3036
No value(s) available!
3137

3238
denki.bat.power_now
33-
Data Type: double InDom: 156.2 0x27000002
39+
Data Type: double InDom: 156.3 0x27000003
3440
Semantics: instant Units: none
3541
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
3642
No value(s) available!
3743

3844
denki.bat.capacity
39-
Data Type: 32-bit int InDom: 156.3 0x27000003
45+
Data Type: 32-bit int InDom: 156.4 0x27000004
4046
Semantics: instant Units: none
4147
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
4248
No value(s) available!
@@ -46,30 +52,36 @@ No value(s) available!
4652
Updating the Performance Metrics Name Space (PMNS) ...
4753
Terminate PMDA if already installed ...
4854
Updating the PMCD control file, and notifying PMCD ...
49-
Check denki metrics have appeared ... 4 metrics and 3 values
55+
Check denki metrics have appeared ... 5 metrics and 3 values
5056

51-
denki.rapl
57+
denki.raplsysfs
5258
Data Type: 64-bit unsigned int InDom: 156.0 0x27000000
5359
Semantics: counter Units: none
54-
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
60+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
61+
No value(s) available!
62+
63+
denki.raplmsr
64+
Data Type: 64-bit unsigned int InDom: 156.1 0x27000001
65+
Semantics: counter Units: none
66+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplmsr","machineid":"MACHINEID","userid":USERID}
5567
No value(s) available!
5668

5769
denki.bat.energy_now
58-
Data Type: double InDom: 156.1 0x27000001
70+
Data Type: double InDom: 156.2 0x27000002
5971
Semantics: instant Units: none
6072
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
6173
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
6274
inst [N or BATTERY-N"] value 15.23
6375

6476
denki.bat.power_now
65-
Data Type: double InDom: 156.2 0x27000002
77+
Data Type: double InDom: 156.3 0x27000003
6678
Semantics: instant Units: none
6779
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
6880
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
6981
inst [N or BATTERY-N"] value 4.077
7082

7183
denki.bat.capacity
72-
Data Type: 32-bit int InDom: 156.3 0x27000003
84+
Data Type: 32-bit int InDom: 156.4 0x27000004
7385
Semantics: instant Units: none
7486
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
7587
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
@@ -80,23 +92,29 @@ denki.bat.capacity
8092
Updating the Performance Metrics Name Space (PMNS) ...
8193
Terminate PMDA if already installed ...
8294
Updating the PMCD control file, and notifying PMCD ...
83-
Check denki metrics have appeared ... 4 metrics and 10 values
95+
Check denki metrics have appeared ... 5 metrics and 10 values
8496

85-
denki.rapl
97+
denki.raplsysfs
8698
Data Type: 64-bit unsigned int InDom: 156.0 0x27000000
8799
Semantics: counter Units: none
88-
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
89-
inst [0 or "package-0"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
90-
inst [1 or "core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
91-
inst [2 or "uncore"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
92-
inst [3 or "dram"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
100+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
101+
inst [0 or "package-0"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
102+
inst [1 or "core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
103+
inst [2 or "uncore"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
104+
inst [3 or "dram"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
93105
inst [2 or "uncore"] value 1
94106
inst [1 or "core"] value 1568
95107
inst [3 or "dram"] value 2120
96108
inst [0 or "package-0"] value 2977
97109

110+
denki.raplmsr
111+
Data Type: 64-bit unsigned int InDom: 156.1 0x27000001
112+
Semantics: counter Units: none
113+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplmsr","machineid":"MACHINEID","userid":USERID}
114+
No value(s) available!
115+
98116
denki.bat.energy_now
99-
Data Type: double InDom: 156.1 0x27000001
117+
Data Type: double InDom: 156.2 0x27000002
100118
Semantics: instant Units: none
101119
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
102120
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
@@ -105,7 +123,7 @@ denki.bat.energy_now
105123
inst [N or BATTERY-N"] value 15.87
106124

107125
denki.bat.power_now
108-
Data Type: double InDom: 156.2 0x27000002
126+
Data Type: double InDom: 156.3 0x27000003
109127
Semantics: instant Units: none
110128
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
111129
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
@@ -114,7 +132,7 @@ denki.bat.power_now
114132
inst [N or BATTERY-N"] value 1.576
115133

116134
denki.bat.capacity
117-
Data Type: 32-bit int InDom: 156.3 0x27000003
135+
Data Type: 32-bit int InDom: 156.4 0x27000004
118136
Semantics: instant Units: none
119137
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
120138
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
@@ -127,37 +145,43 @@ denki.bat.capacity
127145
Updating the Performance Metrics Name Space (PMNS) ...
128146
Terminate PMDA if already installed ...
129147
Updating the PMCD control file, and notifying PMCD ...
130-
Check denki metrics have appeared ... 4 metrics and 7 values
148+
Check denki metrics have appeared ... 5 metrics and 7 values
131149

132-
denki.rapl
150+
denki.raplsysfs
133151
Data Type: 64-bit unsigned int InDom: 156.0 0x27000000
134152
Semantics: counter Units: none
135-
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
136-
inst [0 or "package-0"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
137-
inst [1 or "core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
138-
inst [2 or "uncore"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
139-
inst [3 or "dram"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
153+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
154+
inst [0 or "package-0"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
155+
inst [1 or "core"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
156+
inst [2 or "uncore"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
157+
inst [3 or "dram"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplsysfs","machineid":"MACHINEID","userid":USERID}
140158
inst [1 or "core"] value 12628
141159
inst [0 or "package-0"] value 26716
142160
inst [2 or "uncore"] value 2711
143161
inst [3 or "dram"] value 7743
144162

163+
denki.raplmsr
164+
Data Type: 64-bit unsigned int InDom: 156.1 0x27000001
165+
Semantics: counter Units: none
166+
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"raplmsr","machineid":"MACHINEID","userid":USERID}
167+
No value(s) available!
168+
145169
denki.bat.energy_now
146-
Data Type: double InDom: 156.1 0x27000001
170+
Data Type: double InDom: 156.2 0x27000002
147171
Semantics: instant Units: none
148172
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
149173
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
150174
inst [N or BATTERY-N"] value 34.71
151175

152176
denki.bat.power_now
153-
Data Type: double InDom: 156.2 0x27000002
177+
Data Type: double InDom: 156.3 0x27000003
154178
Semantics: instant Units: none
155179
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
156180
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
157181
inst [N or BATTERY-N"] value 26.439
158182

159183
denki.bat.capacity
160-
Data Type: 32-bit int InDom: 156.3 0x27000003
184+
Data Type: 32-bit int InDom: 156.4 0x27000004
161185
Semantics: instant Units: none
162186
labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
163187
inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}

‎src/pmdas/denki/denki.c

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,6 @@
2020
* ( https://github.com/deater/uarch-configure / GPL-2.0 License )
2121
*/
2222

23-
/* TODO:
24-
- update manpage, README.md, pmda-denki handbook
25-
- bring upstream
26-
- try on fedora steam deck (AMD)
27-
- see how psys metrics matches i.e. battery consumption metric
28-
- consider to implement new PCP test cases.. might be hard for msr metrics..
29-
30-
* Usage on rhel9:
31-
dnf -y install pcp-zeroconf pcp-devel pcp-pmda-denki gcc tar redhat-rpm-config
32-
cd /usr/libexec/pcp/pmdas/
33-
mv denki denki.org
34-
tar xfv ~/denki_raplmsr3.tar
35-
cd denki
36-
semodule -i selinux/denki-msr-read.pp
37-
make
38-
./Install
39-
pminfo -f denki
40-
*/
41-
4223
#include <pcp/pmapi.h>
4324
#include <pcp/pmda.h>
4425
#include "domain.h"
@@ -268,12 +249,14 @@ static long long read_msr(int fd, int which) {
268249
static int detect_cpu(void) {
269250

270251
FILE *fff;
252+
char filename[MAXPATHLEN];
271253

272254
int family,model=-1;
273255
char buffer[BUFSIZ],*result;
274256
char vendor[BUFSIZ];
275257

276-
fff=fopen("/proc/cpuinfo","r");
258+
pmsprintf(filename,sizeof(filename), "%s/proc/cpuinfo",rootpath);
259+
fff=fopen(filename,"r");
277260
if (fff==NULL) return -1;
278261

279262
while(1) {
@@ -551,7 +534,7 @@ static int open_msr(int core) {
551534
char msr_filename[BUFSIZ];
552535
int fd;
553536

554-
pmsprintf(msr_filename,sizeof(msr_filename),"/dev/cpu/%d/msr", core);
537+
pmsprintf(msr_filename,sizeof(msr_filename),"%s/dev/cpu/%d/msr", rootpath, core);
555538
fd = open(msr_filename, O_RDONLY);
556539
if ( fd < 0 ) {
557540
if ( errno == ENXIO ) {

0 commit comments

Comments
 (0)