src/pmdas/denki: reconcile changes from Ken and Christian

This commit merges (and replaces) the changes from Christian in #1832.
performancecopilot · Oct 25, 2023 · 06b01e8 · 06b01e8
1 parent 18d9be8
commit 06b01e8
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 183 deletions.
diff --git a/qa/1653.out b/qa/1653.out
@@ -8,7 +8,7 @@ QA output created by 1653
 Updating the Performance Metrics Name Space (PMNS) ...
 Terminate PMDA if already installed ...
 Updating the PMCD control file, and notifying PMCD ...
-Check denki metrics have appeared ... 5 metrics and 4 values
+Check denki metrics have appeared ... 4 metrics and 4 values
 
 denki.rapl
     Data Type: 64-bit unsigned int  InDom: 156.0 0x27000000
@@ -23,26 +23,20 @@ denki.rapl
     inst [3 or "1-core"] value 8334
     inst [0 or "0-package-1"] value 8826
 
-denki.bat.energy_now_raw
+denki.bat.energy_now
     Data Type: double  InDom: 156.1 0x27000001
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
 No value(s) available!
 
-denki.bat.energy_now_rate
-    Data Type: double  InDom: 156.2 0x27000002
-    Semantics: instant  Units: none
-    labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-No value(s) available!
-
 denki.bat.power_now
-    Data Type: double  InDom: 156.3 0x27000003
+    Data Type: double  InDom: 156.2 0x27000002
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
 No value(s) available!
 
 denki.bat.capacity
-    Data Type: 32-bit int  InDom: 156.4 0x27000004
+    Data Type: 32-bit int  InDom: 156.3 0x27000003
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
 No value(s) available!
@@ -52,37 +46,30 @@ No value(s) available!
 Updating the Performance Metrics Name Space (PMNS) ...
 Terminate PMDA if already installed ...
 Updating the PMCD control file, and notifying PMCD ...
-Check denki metrics have appeared ... 5 metrics and 4 values
+Check denki metrics have appeared ... 4 metrics and 3 values
 
 denki.rapl
     Data Type: 64-bit unsigned int  InDom: 156.0 0x27000000
     Semantics: counter  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","indom_name":"rapl","machineid":"MACHINEID","userid":USERID}
 No value(s) available!
 
-denki.bat.energy_now_raw
+denki.bat.energy_now
     Data Type: double  InDom: 156.1 0x27000001
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
     inst [N or BATTERY-N"] value 15.23
 
-denki.bat.energy_now_rate
-    Data Type: double  InDom: 156.2 0x27000002
-    Semantics: instant  Units: none
-    labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] value 0
-
 denki.bat.power_now
-    Data Type: double  InDom: 156.3 0x27000003
+    Data Type: double  InDom: 156.2 0x27000002
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] value 4.077
+    inst [N or BATTERY-N"] value 18446744073705.47
 
 denki.bat.capacity
-    Data Type: 32-bit int  InDom: 156.4 0x27000004
+    Data Type: 32-bit int  InDom: 156.3 0x27000003
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
@@ -93,7 +80,7 @@ denki.bat.capacity
 Updating the Performance Metrics Name Space (PMNS) ...
 Terminate PMDA if already installed ...
 Updating the PMCD control file, and notifying PMCD ...
-Check denki metrics have appeared ... 5 metrics and 12 values
+Check denki metrics have appeared ... 4 metrics and 10 values
 
 denki.rapl
     Data Type: 64-bit unsigned int  InDom: 156.0 0x27000000
@@ -108,7 +95,7 @@ denki.rapl
     inst [3 or "dram"] value 2120
     inst [0 or "package-0"] value 2977
 
-denki.bat.energy_now_raw
+denki.bat.energy_now
     Data Type: double  InDom: 156.1 0x27000001
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
@@ -117,17 +104,8 @@ denki.bat.energy_now_raw
     inst [N or BATTERY-N"] value 14.94
     inst [N or BATTERY-N"] value 15.87
 
-denki.bat.energy_now_rate
-    Data Type: double  InDom: 156.2 0x27000002
-    Semantics: instant  Units: none
-    labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] value 0
-    inst [N or BATTERY-N"] value 0
-
 denki.bat.power_now
-    Data Type: double  InDom: 156.3 0x27000003
+    Data Type: double  InDom: 156.2 0x27000002
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
@@ -136,7 +114,7 @@ denki.bat.power_now
     inst [N or BATTERY-N"] value 1.576
 
 denki.bat.capacity
-    Data Type: 32-bit int  InDom: 156.4 0x27000004
+    Data Type: 32-bit int  InDom: 156.3 0x27000003
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
@@ -149,7 +127,7 @@ denki.bat.capacity
 Updating the Performance Metrics Name Space (PMNS) ...
 Terminate PMDA if already installed ...
 Updating the PMCD control file, and notifying PMCD ...
-Check denki metrics have appeared ... 5 metrics and 8 values
+Check denki metrics have appeared ... 4 metrics and 7 values
 
 denki.rapl
     Data Type: 64-bit unsigned int  InDom: 156.0 0x27000000
@@ -164,29 +142,22 @@ denki.rapl
     inst [2 or "uncore"] value 2711
     inst [3 or "dram"] value 7743
 
-denki.bat.energy_now_raw
+denki.bat.energy_now
     Data Type: double  InDom: 156.1 0x27000001
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt hours","userid":USERID}
     inst [N or BATTERY-N"] value 34.71
 
-denki.bat.energy_now_rate
-    Data Type: double  InDom: 156.2 0x27000002
-    Semantics: instant  Units: none
-    labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
-    inst [N or BATTERY-N"] value 0
-
 denki.bat.power_now
-    Data Type: double  InDom: 156.3 0x27000003
+    Data Type: double  InDom: 156.2 0x27000002
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"watt","userid":USERID}
     inst [N or BATTERY-N"] value 26.439
 
 denki.bat.capacity
-    Data Type: 32-bit int  InDom: 156.4 0x27000004
+    Data Type: 32-bit int  InDom: 156.3 0x27000003
     Semantics: instant  Units: none
     labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}
     inst [N or BATTERY-N"] labels {"agent":"denki","domainname":"DOMAINNAME","groupid":GROUPID,"hostname":"HOSTNAME","machineid":"MACHINEID","units":"percent","userid":USERID}

diff --git a/src/pmdas/denki/README b/src/pmdas/denki/README
@@ -58,9 +58,9 @@ Troubleshooting
 Usage scenarios/examples
 ========================
 
- -  denki.rapl.rate:
+ -  denki.rapl:
 
-    If RAPL is available, denki.rapl.rate can give an estimation of
+    If RAPL is available, denki.rapl can give an estimation of
     the current power consumption.  On laptops, typically 4 RAPL
     domains are available:
 
@@ -69,31 +69,16 @@ Usage scenarios/examples
       inst [2 or "uncore"]    - typically GPU, if on motherboard
       inst [3 or "dram"]      - memory
 
-    When accessed with 'pmrep denki.rapl.rate', these values can
-    be used to compare for example power consumption of various
-    webbrowsers while playing a video or webgl sites.  One can
+    These values can be used to compare for example power consumption of 
+    various web browsers while playing a video or webgl sites.  One can
     also verify if offloading to the GPU is working.
 
     On systems with multiple numa zones, also multiple RAPL 
     packages can be available, pmda-denki should properly deal
     with these.  For these, i.e. domains 0-package-0 and
     1-package-0 will become available as instances.
 
- -  denki.rapl.raw:
-
-    If RAPL is available, this provides the raw values from the
-    kernel.  These can be utilized for more accurate power con-
-    sumption comparisons.  Example workflow:
-
-    1) query the values, i.e. using 'pminfo denki.rapl.raw'
-    2) run your workload
-    3) query the current values again, use the values from 1)
-       and the time between 1) and 3) to compute the overall
-       consumption.
-    4) Perform 1) to 3) again, with a different software or
-       a different software version.
-
- -  denki.bat.energy_now_raw:
+ -  denki.bat.energy_now:
 
     If battery readings are available, this metric has the
     current reading, so the charge level of the battery.
@@ -118,3 +103,7 @@ Usage scenarios/examples
     system consumption.  This is computed by firmware/driver,
     and much more frequently updated than 
     denki.bat.energy_now_rate.
+
+ -  denki.bat.capacity:
+
+	This metric reports the fillstate of the battery in percent.