simtest: Add non regression tests for USB statistics

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/rd_stats.c b/rd_stats.c
index bf7b4ce2dbf88a30c53ecf663599d4b19773d932..284ba2f97263f7749352582d18c016ff31b6e37f 100644 (file)
--- a/rd_stats.c
+++ b/rd_stats.c
@@ -2473,11 +2473,11 @@ __nr_t read_bus_usb_dev(struct stats_pwr_usb *st_pwr_usb, __nr_t nr_alloc)
        __nr_t usb_read = 0;
 
        /* Open relevant /sys directory */
-       if ((dir = opendir(SYSFS_USBDEV)) == NULL)
+       if ((dir = __opendir(SYSFS_USBDEV)) == NULL)
                return 0;
 
        /* Get current file entry */
-       while ((drd = readdir(dir)) != NULL) {
+       while ((drd = __readdir(dir)) != NULL) {
 
                if (isdigit(drd->d_name[0]) && !strchr(drd->d_name, ':')) {
 
@@ -2493,7 +2493,7 @@ __nr_t read_bus_usb_dev(struct stats_pwr_usb *st_pwr_usb, __nr_t nr_alloc)
        }
 
        /* Close directory */
-       closedir(dir);
+       __closedir(dir);
        return usb_read;
 }
 

diff --git a/tests/expected.data-ini b/tests/expected.data-ini
index 5c74265c6e8230611c2a9b30a9b90c3b2ba38c8e..1a34b39fcd54833a5c39495757bf4af0af9d5cb2 100644 (file)
--- a/tests/expected.data-ini
+++ b/tests/expected.data-ini
@@ -2923,6 +2923,16 @@ Average:          4   3505.84
 Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
+13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:29          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:49          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          3       5e3       608       200                         USB2.0 Hub
+13:20:49          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+Summary:          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+Summary:          3      174c      55aa         0 ASMT                    ASM1153
+Summary:          3       5e3       608       200                         USB2.0 Hub
+Summary:          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
 
 13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
 13:20:19          705       145     17.04     18.92   6008414    102818      1.68 /dev/sda9

diff --git a/tests/expected.sadf-H b/tests/expected.sadf-H
index e40861f6c0eb024af05c2f699ab163992a4899eb..b51a2fab4f50a134579d7da7ad471d83d682141a 100644 (file)
--- a/tests/expected.sadf-H
+++ b/tests/expected.sadf-H
@@ -8,7 +8,7 @@ Timezone: GMT
 File composition: (1,1,12),(0,0,9),(2,0,1)
 Size of a long int: 8
 HZ = 100
-Number of activities in file: 37
+Number of activities in file: 38
 Extra structures available: N
 List of activities:
 01: [8b] A_CPU                Y:  10   (10,0,0)
@@ -44,6 +44,7 @@ List of activities:
 38: [8a] A_NET_FC             Y:   1   (0,4,0)
 39: [8a] A_NET_SOFT           Y:  10   (0,0,5)
 30: [8a] A_PWR_CPU            Y:  10   (0,1,0)
+36: [8a] A_PWR_USB            Y:   2   (0,0,4)
 37: [8b] A_FS                 Y:   4   (5,0,0)
 40: [8a] A_PSI_CPU            N:   1   (1,3,0)
 41: [8a] A_PSI_IO             N:   1   (2,6,0)

diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d
index 815c15281fa31b1f8bc40fecbfae7354ca820db0..755d6d1d84b325abe0a9b556a508a2240efc3cc4 100644 (file)
--- a/tests/expected.sadf-d
+++ b/tests/expected.sadf-d
@@ -2314,6 +2314,13 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;4;3505.84
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;5;3493.55
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;6;3492.22
 SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;7;3497.56
+# hostname;interval;timestamp;manufact;product;BUS;idvendor;idprod;maxpower
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;1;3f0;862;196;HP;HP Wireless Keyboard Mouse Kit
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;3;174c;55aa;0;ASMT;ASM1153
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;1;3f0;862;196;HP;HP Wireless Keyboard Mouse Kit
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;3;174c;55aa;0;ASMT;ASM1153
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;3;5e3;608;200;;USB2.0 Hub
+SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;3;4f2;b62a;1000;Chicony Electronics C;HP Webcam
 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused
 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda9;705;145;17.04;18.92;6008414;102818;1.68
 SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;/dev/sda7;2496;845;25.29;46.57;19051710;150338;0.78
@@ -2970,6 +2977,7 @@ SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;6;3492.22
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;7;3497.56
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;8;3497.56
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;9;3497.56
+# hostname;interval;timestamp;manufact;product;BUS;idvendor;idprod;maxpower
 # hostname;interval;timestamp;FILESYSTEM;MBfsfree;MBfsused;%fsused;%ufsused;Ifree;Iused;%Iused
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda9;705;145;17.04;18.92;6008414;102818;1.68
 SYSSTAT.TEST;31;2019-04-18 13:54:35 UTC;/dev/sda7;273;206;42.93;51.97;19201593;455;0.00

diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j
index ef23580a0a90f6e042e2939da78ffee2393c21bd..1ac6060a2712c215d48a538ed1bb0021bcb02465 100644 (file)
--- a/tests/expected.sadf-j
+++ b/tests/expected.sadf-j
@@ -1200,6 +1200,10 @@
                                                        {"number": "5", "frequency": 3493.55},
                                                        {"number": "6", "frequency": 3492.22},
                                                        {"number": "7", "frequency": 3497.56}
+                                               ],
+                                               "usb-devices": [
+                                                       {"bus_number": 1, "idvendor": "3f0", "idprod": "862", "maxpower": 196, "manufact": "HP", "product": "HP Wireless Keyboard Mouse Kit"},
+                                                       {"bus_number": 3, "idvendor": "174c", "idprod": "55aa", "maxpower": 0, "manufact": "ASMT", "product": "ASM1153"}
                                                ]
                                        },
                                        "filesystems": [
@@ -2422,6 +2426,12 @@
                                                        {"number": "5", "frequency": 3493.55},
                                                        {"number": "6", "frequency": 3492.22},
                                                        {"number": "7", "frequency": 3497.56}
+                                               ],
+                                               "usb-devices": [
+                                                       {"bus_number": 1, "idvendor": "3f0", "idprod": "862", "maxpower": 196, "manufact": "HP", "product": "HP Wireless Keyboard Mouse Kit"},
+                                                       {"bus_number": 3, "idvendor": "174c", "idprod": "55aa", "maxpower": 0, "manufact": "ASMT", "product": "ASM1153"},
+                                                       {"bus_number": 3, "idvendor": "5e3", "idprod": "608", "maxpower": 200, "manufact": "", "product": "USB2.0 Hub"},
+                                                       {"bus_number": 3, "idvendor": "4f2", "idprod": "b62a", "maxpower": 1000, "manufact": "Chicony Electronics C", "product": "HP Webcam"}
                                                ]
                                        },
                                        "filesystems": [

diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p
index ba6ba3dd24ea3a9260d39781964beafa848ff110..50305c30ce29ba99fc49c43f53efb8fde081b475 100644 (file)
--- a/tests/expected.sadf-p
+++ b/tests/expected.sadf-p
@@ -4221,6 +4221,36 @@ SYSSTAT.TEST     22      2019-04-18 13:20:49 UTC cpu4    MHz     3505.84
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC cpu5    MHz     3493.55
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC cpu6    MHz     3492.22
 SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC cpu7    MHz     3497.56
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    idvendor        3f0
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    idprod  862
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    maxpower        196
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    manufact        HP
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus1    product HP Wireless Keyboard Mouse Kit
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus3    idvendor        174c
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus3    idprod  55aa
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus3    maxpower        0
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus3    manufact        ASMT
+SYSSTAT.TEST   31      2019-04-18 13:20:29 UTC bus3    product ASM1153
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus1    idvendor        3f0
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus1    idprod  862
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus1    maxpower        196
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus1    manufact        HP
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus1    product HP Wireless Keyboard Mouse Kit
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    idvendor        174c
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    idprod  55aa
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    maxpower        0
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    manufact        ASMT
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    product ASM1153
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    idvendor        5e3
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    idprod  608
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    maxpower        200
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    manufact        
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    product USB2.0 Hub
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    idvendor        4f2
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    idprod  b62a
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    maxpower        1000
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    manufact        Chicony Electronics C
+SYSSTAT.TEST   22      2019-04-18 13:20:49 UTC bus3    product HP Webcam
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC /dev/sda9       MBfsfree        705
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC /dev/sda9       MBfsused        145
 SYSSTAT.TEST   31      2019-04-18 13:20:19 UTC /dev/sda9       %fsused 17.04

diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r
index 22eee52844461b287b9618a00130da5a20090c02..0de983b7a84924a7fdd2c72ddc2768f0457fbc86 100644 (file)
--- a/tests/expected.sadf-r
+++ b/tests/expected.sadf-r
@@ -2592,6 +2592,21 @@
 13:20:49 UTC; CPU; 7; MHz; 349756;
 # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29
 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19
+# name; A_PWR_USB; nr_curr; 0; nr_alloc; 4; nr_ini; 2
+# uptime_cs; 725496; ust_time; 1555593629; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:29
+# name; A_PWR_USB; nr_curr; 2; nr_alloc; 4; nr_ini; 2
+13:20:29 UTC; manufact; "HP"; product; "HP Wireless Keyboard Mouse Kit"; BUS; 1; idvendor; 3f0; idprod; 862; maxpower; 98;
+13:20:29 UTC; manufact; "ASMT"; product; "ASM1153"; BUS; 3; idvendor; 174c; idprod; 55aa; maxpower; 0;
+# uptime_cs; 729346; ust_time; 1555593639; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:39
+# name; A_PWR_USB; nr_curr; 0; nr_alloc; 4; nr_ini; 2
+# uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49
+# name; A_PWR_USB; nr_curr; 4; nr_alloc; 4; nr_ini; 2
+13:20:49 UTC; manufact; "HP"; product; "HP Wireless Keyboard Mouse Kit"; BUS; 1; idvendor; 3f0; idprod; 862; maxpower; 98;
+13:20:49 UTC; manufact; "ASMT"; product; "ASM1153"; BUS; 3; idvendor; 174c; idprod; 55aa; maxpower; 0;
+13:20:49 UTC; manufact; ""; product; "USB2.0 Hub"; BUS; 3; idvendor; 5e3; idprod; 608; maxpower; 100;
+13:20:49 UTC; manufact; "Chicony Electronics C"; product; "HP Webcam"; BUS; 3; idvendor; 4f2; idprod; b62a; maxpower; 500;
+# uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29
+# uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19
 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4
 13:20:19 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232;
 13:20:19 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 2616732672; f_blocks; 3502345216; f_bavail; 1871315456; Ifree; 19051710; f_files; 19202048;
@@ -3316,6 +3331,8 @@
 13:54:35 UTC; CPU; 8; MHz; 349756;
 13:54:35 UTC; CPU; 9; MHz; 349756;
 # uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
+# name; A_PWR_USB; nr_curr; 0; nr_alloc; 4; nr_ini; 2
+# uptime_cs; 722372; ust_time; 1555595675; extra_next; 0; record_type; 1; HH:MM:SS; 13:54:35
 # name; A_FS; nr_curr; 4; nr_alloc; 8; nr_ini; 4
 13:54:35 UTC; FILESYSTEM; "/dev/sda9"; f_bfree; 739427840; f_blocks; 891291136; f_bavail; 722675712; Ifree; 6008414; f_files; 6111232;
 13:54:35 UTC; FILESYSTEM; "/dev/sda7"; f_bfree; 286670336; f_blocks; 502345216; f_bavail; 241253120; Ifree; 19201593; f_files; 19202048;

diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x
index 24bebc27bc97d014d4e7de6c15c2973f7abddc48..dd1ef43eb31eec889530f9dd00b0e539d08e213a 100644 (file)
--- a/tests/expected.sadf-x
+++ b/tests/expected.sadf-x
@@ -1258,6 +1258,10 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                                <cpufreq number="6" frequency="3492.22"/>
                                                <cpufreq number="7" frequency="3497.56"/>
                                        </cpu-frequency>
+                                       <usb-devices>
+                                               <usb bus_number="1" idvendor="3f0" idprod="862" maxpower="196" manufact="HP" product="HP Wireless Keyboard Mouse Kit"/>
+                                               <usb bus_number="3" idvendor="174c" idprod="55aa" maxpower="0" manufact="ASMT" product="ASM1153"/>
+                                       </usb-devices>
                                </power-management>
                                <filesystems>
                                        <filesystem fsname="/dev/sda9" MBfsfree="1618" MBfsused="127" fsused-percent="7.27" ufsused-percent="39.50" Ifree="1621550" Iused="299810" Iused-percent="15.60"/>
@@ -2532,6 +2536,12 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd">
                                                <cpufreq number="6" frequency="3492.22"/>
                                                <cpufreq number="7" frequency="3497.56"/>
                                        </cpu-frequency>
+                                       <usb-devices>
+                                               <usb bus_number="1" idvendor="3f0" idprod="862" maxpower="196" manufact="HP" product="HP Wireless Keyboard Mouse Kit"/>
+                                               <usb bus_number="3" idvendor="174c" idprod="55aa" maxpower="0" manufact="ASMT" product="ASM1153"/>
+                                               <usb bus_number="3" idvendor="5e3" idprod="608" maxpower="200" manufact="" product="USB2.0 Hub"/>
+                                               <usb bus_number="3" idvendor="4f2" idprod="b62a" maxpower="1000" manufact="Chicony Electronics C" product="HP Webcam"/>
+                                       </usb-devices>
                                </power-management>
                                <filesystems>
                                        <filesystem fsname="/dev/sda9" MBfsfree="705" MBfsused="145" fsused-percent="17.04" ufsused-percent="18.92" Ifree="6008414" Iused="102818" Iused-percent="1.68"/>

diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec
index ec405481a94d3d2b315015bb5492fe65f372bcda..4bdd104961f42e61228b52654338bd32c4ce26fa 100644 (file)
--- a/tests/expected.sar-dec
+++ b/tests/expected.sar-dec
@@ -2926,6 +2926,18 @@ Average:          5      3494
 Average:          6      3492
 Average:          7      3498
 
+13:20:09        BUS  idvendor    idprod  maxpower manufact                product
+13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:29          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:49          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          3       5e3       608       200                         USB2.0 Hub
+13:20:49          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+Summary:          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+Summary:          3      174c      55aa         0 ASMT                    ASM1153
+Summary:          3       5e3       608       200                         USB2.0 Hub
+Summary:          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+
 13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
 13:20:19          705       145        17        19   6008414    102818         2 /dev/sda9
 13:20:19         2496       845        25        47  19051710    150338         1 /dev/sda7

diff --git a/tests/expected.sar-human b/tests/expected.sar-human
index 8409ebd627fac8106a83bf590427e35d279a199e..d876698593e98933e4ae9440de6105d664c5ffbf 100644 (file)
--- a/tests/expected.sar-human
+++ b/tests/expected.sar-human
@@ -2926,6 +2926,18 @@ Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
 
+13:20:09        BUS  idvendor    idprod  maxpower manufact                product
+13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:29          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:49          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          3       5e3       608       200                         USB2.0 Hub
+13:20:49          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+Summary:          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+Summary:          3      174c      55aa         0 ASMT                    ASM1153
+Summary:          3       5e3       608       200                         USB2.0 Hub
+Summary:          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+
 13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
 13:20:19       705.2M    144.8M     17.0%     18.9%   6008414    102818      1.7% /dev/sda9
 13:20:19         2.4G    844.6M     25.3%     46.6%  19051710    150338      0.8% /dev/sda7

diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all
index d29b1c49fb72dc74fa71ebac4d70f979a6addb39..e98573fa857aaf286b9571e94b102b1ab642010a 100644 (file)
--- a/tests/expected2.sar-all
+++ b/tests/expected2.sar-all
@@ -2926,6 +2926,18 @@ Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
 
+13:20:09        BUS  idvendor    idprod  maxpower manufact                product
+13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:29          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:49          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          3       5e3       608       200                         USB2.0 Hub
+13:20:49          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+Summary:          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+Summary:          3      174c      55aa         0 ASMT                    ASM1153
+Summary:          3       5e3       608       200                         USB2.0 Hub
+Summary:          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+
 13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
 13:20:19          705       145     17.04     18.92   6008414    102818      1.68 /dev/sda9
 13:20:19         2496       845     25.29     46.57  19051710    150338      0.78 /dev/sda7

diff --git a/tests/expected2.sar32-A b/tests/expected2.sar32-A
index 037deb8730b1b8fa2ba944d5bfc0d26744fc0ca4..3fd987cc75fa664e8ea9695e3524da44563a4902 100644 (file)
--- a/tests/expected2.sar32-A
+++ b/tests/expected2.sar32-A
@@ -1772,6 +1772,18 @@ Average:          5   3493.55
 Average:          6   3492.22
 Average:          7   3497.56
 
+13:20:09        BUS  idvendor    idprod  maxpower manufact                product
+13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:29          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:49          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          3       5e3       608       200                         USB2.0 Hub
+13:20:49          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+Summary:          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+Summary:          3      174c      55aa         0 ASMT                    ASM1153
+Summary:          3       5e3       608       200                         USB2.0 Hub
+Summary:          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+
 13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
 13:20:19          705       145     17.04     18.92   6008414    102818      1.68 /dev/sda9
 13:20:19         2496       845     25.29     46.57  19051710    150338      0.78 /dev/sda7

diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all
index 5032ca7ccec3f79eadb3192f590ac306961225d4..d8a68870719d033f0cfa1a59f8a7cfcb4b99e719 100644 (file)
--- a/tests/expected3.sar-all
+++ b/tests/expected3.sar-all
@@ -379,6 +379,18 @@ Average:          3      0.00      0.00      0.00      0.00      0.00
 13:20:49          3   3566.22
 Average:          3   3566.22
 
+13:20:09        BUS  idvendor    idprod  maxpower manufact                product
+13:20:29          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:29          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+13:20:49          3      174c      55aa         0 ASMT                    ASM1153
+13:20:49          3       5e3       608       200                         USB2.0 Hub
+13:20:49          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+Summary:          1       3f0       862       196 HP                      HP Wireless Keyboard Mouse Kit
+Summary:          3      174c      55aa         0 ASMT                    ASM1153
+Summary:          3       5e3       608       200                         USB2.0 Hub
+Summary:          3       4f2      b62a      1000 Chicony Electronics C   HP Webcam
+
 13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
 13:20:19          705       145     17.04     18.92   6008414    102818      1.68 /dev/sda9
 13:20:19         2496       845     25.29     46.57  19051710    150338      0.78 /dev/sda7

diff --git a/tests/root.README b/tests/root.README
index 4515c02e5fb40e00ecc4f350c630c549d249d2a9..df82f39bc3fcb4c4e7bcd5097eae958675b3ab74 100644 (file)
--- a/tests/root.README
+++ b/tests/root.README
@@ -2,6 +2,7 @@
 /proc/diskstats
 dm-2 virtual device present
 
+Statistics available for some USB devices
 tape statistics available
 CIFS SMB1 statistics available
 
@@ -15,6 +16,7 @@ PID:
 /proc/stat:
 CPU#8: offline
 
+No USB devices
 tape statistics available
 CIFS SMB1 statistics available. New share added.
 
@@ -46,6 +48,7 @@ enp6s0: unregistered then registered again
 sdf,sdg: registered
 sdh: autofs, registered
 
+Statistics available for some USB devices
 CIFS SMB1 statistics available
 
 PID:

diff --git a/tests/root1/sys/bus/usb/devices/1-3/bMaxPower b/tests/root1/sys/bus/usb/devices/1-3/bMaxPower
new file mode 100644 (file)
index 0000000..a4ec56a
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/1-3/bMaxPower
@@ -0,0 +1 @@
+98mA

diff --git a/tests/root1/sys/bus/usb/devices/1-3/idProduct b/tests/root1/sys/bus/usb/devices/1-3/idProduct
new file mode 100644 (file)
index 0000000..46ee9c5
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/1-3/idProduct
@@ -0,0 +1 @@
+0862

diff --git a/tests/root1/sys/bus/usb/devices/1-3/idVendor b/tests/root1/sys/bus/usb/devices/1-3/idVendor
new file mode 100644 (file)
index 0000000..16c56f1
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/1-3/idVendor
@@ -0,0 +1 @@
+03f0

diff --git a/tests/root1/sys/bus/usb/devices/1-3/manufacturer b/tests/root1/sys/bus/usb/devices/1-3/manufacturer
new file mode 100644 (file)
index 0000000..e8b2ad6
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/1-3/manufacturer
@@ -0,0 +1 @@
+HP

diff --git a/tests/root1/sys/bus/usb/devices/1-3/product b/tests/root1/sys/bus/usb/devices/1-3/product
new file mode 100644 (file)
index 0000000..7b4b707
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/1-3/product
@@ -0,0 +1 @@
+HP Wireless Keyboard Mouse Kit

diff --git a/tests/root1/sys/bus/usb/devices/3-1/bMaxPower b/tests/root1/sys/bus/usb/devices/3-1/bMaxPower
new file mode 100644 (file)
index 0000000..123f90f
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/3-1/bMaxPower
@@ -0,0 +1 @@
+0mA

diff --git a/tests/root1/sys/bus/usb/devices/3-1/idProduct b/tests/root1/sys/bus/usb/devices/3-1/idProduct
new file mode 100644 (file)
index 0000000..6c3708f
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/3-1/idProduct
@@ -0,0 +1 @@
+55aa

diff --git a/tests/root1/sys/bus/usb/devices/3-1/idVendor b/tests/root1/sys/bus/usb/devices/3-1/idVendor
new file mode 100644 (file)
index 0000000..a859ece
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/3-1/idVendor
@@ -0,0 +1 @@
+174c

diff --git a/tests/root1/sys/bus/usb/devices/3-1/manufacturer b/tests/root1/sys/bus/usb/devices/3-1/manufacturer
new file mode 100644 (file)
index 0000000..d39a174
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/3-1/manufacturer
@@ -0,0 +1 @@
+ASMT

diff --git a/tests/root1/sys/bus/usb/devices/3-1/product b/tests/root1/sys/bus/usb/devices/3-1/product
new file mode 100644 (file)
index 0000000..0c40836
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/3-1/product
@@ -0,0 +1 @@
+ASM1153

diff --git a/tests/root1/sys/bus/usb/devices/3-1:1.0 b/tests/root1/sys/bus/usb/devices/3-1:1.0
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/root1/sys/bus/usb/devices/_list b/tests/root1/sys/bus/usb/devices/_list
new file mode 100644 (file)
index 0000000..6e4fb7c
--- /dev/null
+++ b/tests/root1/sys/bus/usb/devices/_list
@@ -0,0 +1,5 @@
+.
+..
+1-3
+3-1
+3-1:1.0

diff --git a/tests/root3/sys/bus/usb/devices/1-3/bMaxPower b/tests/root3/sys/bus/usb/devices/1-3/bMaxPower
new file mode 100644 (file)
index 0000000..a4ec56a
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/1-3/bMaxPower
@@ -0,0 +1 @@
+98mA

diff --git a/tests/root3/sys/bus/usb/devices/1-3/idProduct b/tests/root3/sys/bus/usb/devices/1-3/idProduct
new file mode 100644 (file)
index 0000000..46ee9c5
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/1-3/idProduct
@@ -0,0 +1 @@
+0862

diff --git a/tests/root3/sys/bus/usb/devices/1-3/idVendor b/tests/root3/sys/bus/usb/devices/1-3/idVendor
new file mode 100644 (file)
index 0000000..16c56f1
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/1-3/idVendor
@@ -0,0 +1 @@
+03f0

diff --git a/tests/root3/sys/bus/usb/devices/1-3/manufacturer b/tests/root3/sys/bus/usb/devices/1-3/manufacturer
new file mode 100644 (file)
index 0000000..e8b2ad6
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/1-3/manufacturer
@@ -0,0 +1 @@
+HP

diff --git a/tests/root3/sys/bus/usb/devices/1-3/product b/tests/root3/sys/bus/usb/devices/1-3/product
new file mode 100644 (file)
index 0000000..7b4b707
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/1-3/product
@@ -0,0 +1 @@
+HP Wireless Keyboard Mouse Kit

diff --git a/tests/root3/sys/bus/usb/devices/3-1/bMaxPower b/tests/root3/sys/bus/usb/devices/3-1/bMaxPower
new file mode 100644 (file)
index 0000000..123f90f
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/3-1/bMaxPower
@@ -0,0 +1 @@
+0mA

diff --git a/tests/root3/sys/bus/usb/devices/3-1/idProduct b/tests/root3/sys/bus/usb/devices/3-1/idProduct
new file mode 100644 (file)
index 0000000..6c3708f
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/3-1/idProduct
@@ -0,0 +1 @@
+55aa

diff --git a/tests/root3/sys/bus/usb/devices/3-1/idVendor b/tests/root3/sys/bus/usb/devices/3-1/idVendor
new file mode 100644 (file)
index 0000000..a859ece
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/3-1/idVendor
@@ -0,0 +1 @@
+174c

diff --git a/tests/root3/sys/bus/usb/devices/3-1/manufacturer b/tests/root3/sys/bus/usb/devices/3-1/manufacturer
new file mode 100644 (file)
index 0000000..d39a174
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/3-1/manufacturer
@@ -0,0 +1 @@
+ASMT

diff --git a/tests/root3/sys/bus/usb/devices/3-1/product b/tests/root3/sys/bus/usb/devices/3-1/product
new file mode 100644 (file)
index 0000000..0c40836
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/3-1/product
@@ -0,0 +1 @@
+ASM1153

diff --git a/tests/root3/sys/bus/usb/devices/3-1:1.0 b/tests/root3/sys/bus/usb/devices/3-1:1.0
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/root3/sys/bus/usb/devices/_list b/tests/root3/sys/bus/usb/devices/_list
new file mode 100644 (file)
index 0000000..6e4fb7c
--- /dev/null
+++ b/tests/root3/sys/bus/usb/devices/_list
@@ -0,0 +1,5 @@
+.
+..
+1-3
+3-1
+3-1:1.0

diff --git a/tests/root4/sys/bus/usb/devices/_list b/tests/root4/sys/bus/usb/devices/_list
new file mode 100644 (file)
index 0000000..d494155
--- /dev/null
+++ b/tests/root4/sys/bus/usb/devices/_list
@@ -0,0 +1,2 @@
+.
+..

diff --git a/tests/root5/sys/bus/usb/devices/1-3/bMaxPower b/tests/root5/sys/bus/usb/devices/1-3/bMaxPower
new file mode 100644 (file)
index 0000000..a4ec56a
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/1-3/bMaxPower
@@ -0,0 +1 @@
+98mA

diff --git a/tests/root5/sys/bus/usb/devices/1-3/idProduct b/tests/root5/sys/bus/usb/devices/1-3/idProduct
new file mode 100644 (file)
index 0000000..46ee9c5
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/1-3/idProduct
@@ -0,0 +1 @@
+0862

diff --git a/tests/root5/sys/bus/usb/devices/1-3/idVendor b/tests/root5/sys/bus/usb/devices/1-3/idVendor
new file mode 100644 (file)
index 0000000..16c56f1
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/1-3/idVendor
@@ -0,0 +1 @@
+03f0

diff --git a/tests/root5/sys/bus/usb/devices/1-3/manufacturer b/tests/root5/sys/bus/usb/devices/1-3/manufacturer
new file mode 100644 (file)
index 0000000..e8b2ad6
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/1-3/manufacturer
@@ -0,0 +1 @@
+HP

diff --git a/tests/root5/sys/bus/usb/devices/1-3/product b/tests/root5/sys/bus/usb/devices/1-3/product
new file mode 100644 (file)
index 0000000..7b4b707
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/1-3/product
@@ -0,0 +1 @@
+HP Wireless Keyboard Mouse Kit

diff --git a/tests/root5/sys/bus/usb/devices/3-1/bMaxPower b/tests/root5/sys/bus/usb/devices/3-1/bMaxPower
new file mode 100644 (file)
index 0000000..123f90f
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-1/bMaxPower
@@ -0,0 +1 @@
+0mA

diff --git a/tests/root5/sys/bus/usb/devices/3-1/idProduct b/tests/root5/sys/bus/usb/devices/3-1/idProduct
new file mode 100644 (file)
index 0000000..6c3708f
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-1/idProduct
@@ -0,0 +1 @@
+55aa

diff --git a/tests/root5/sys/bus/usb/devices/3-1/idVendor b/tests/root5/sys/bus/usb/devices/3-1/idVendor
new file mode 100644 (file)
index 0000000..a859ece
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-1/idVendor
@@ -0,0 +1 @@
+174c

diff --git a/tests/root5/sys/bus/usb/devices/3-1/manufacturer b/tests/root5/sys/bus/usb/devices/3-1/manufacturer
new file mode 100644 (file)
index 0000000..d39a174
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-1/manufacturer
@@ -0,0 +1 @@
+ASMT

diff --git a/tests/root5/sys/bus/usb/devices/3-1/product b/tests/root5/sys/bus/usb/devices/3-1/product
new file mode 100644 (file)
index 0000000..0c40836
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-1/product
@@ -0,0 +1 @@
+ASM1153

diff --git a/tests/root5/sys/bus/usb/devices/3-1:1.0 b/tests/root5/sys/bus/usb/devices/3-1:1.0
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/root5/sys/bus/usb/devices/3-2.1/bMaxPower b/tests/root5/sys/bus/usb/devices/3-2.1/bMaxPower
new file mode 100644 (file)
index 0000000..fa61073
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2.1/bMaxPower
@@ -0,0 +1 @@
+500mA

diff --git a/tests/root5/sys/bus/usb/devices/3-2.1/idProduct b/tests/root5/sys/bus/usb/devices/3-2.1/idProduct
new file mode 100644 (file)
index 0000000..8cfe838
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2.1/idProduct
@@ -0,0 +1 @@
+b62a

diff --git a/tests/root5/sys/bus/usb/devices/3-2.1/idVendor b/tests/root5/sys/bus/usb/devices/3-2.1/idVendor
new file mode 100644 (file)
index 0000000..009ebe3
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2.1/idVendor
@@ -0,0 +1 @@
+04f2

diff --git a/tests/root5/sys/bus/usb/devices/3-2.1/manufacturer b/tests/root5/sys/bus/usb/devices/3-2.1/manufacturer
new file mode 100644 (file)
index 0000000..f413437
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2.1/manufacturer
@@ -0,0 +1 @@
+Chicony Electronics Co.,Ltd.

diff --git a/tests/root5/sys/bus/usb/devices/3-2.1/product b/tests/root5/sys/bus/usb/devices/3-2.1/product
new file mode 100644 (file)
index 0000000..4eb36f0
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2.1/product
@@ -0,0 +1 @@
+HP Webcam

diff --git a/tests/root5/sys/bus/usb/devices/3-2/bMaxPower b/tests/root5/sys/bus/usb/devices/3-2/bMaxPower
new file mode 100644 (file)
index 0000000..a3369c7
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2/bMaxPower
@@ -0,0 +1 @@
+100mA

diff --git a/tests/root5/sys/bus/usb/devices/3-2/idProduct b/tests/root5/sys/bus/usb/devices/3-2/idProduct
new file mode 100644 (file)
index 0000000..b5b6ed4
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2/idProduct
@@ -0,0 +1 @@
+0608

diff --git a/tests/root5/sys/bus/usb/devices/3-2/idVendor b/tests/root5/sys/bus/usb/devices/3-2/idVendor
new file mode 100644 (file)
index 0000000..ac9a820
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2/idVendor
@@ -0,0 +1 @@
+05e3

diff --git a/tests/root5/sys/bus/usb/devices/3-2/product b/tests/root5/sys/bus/usb/devices/3-2/product
new file mode 100644 (file)
index 0000000..cea9990
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/3-2/product
@@ -0,0 +1 @@
+USB2.0 Hub

diff --git a/tests/root5/sys/bus/usb/devices/_list b/tests/root5/sys/bus/usb/devices/_list
new file mode 100644 (file)
index 0000000..74174ad
--- /dev/null
+++ b/tests/root5/sys/bus/usb/devices/_list
@@ -0,0 +1,7 @@
+.
+..
+1-3
+3-1
+3-2
+3-2.1
+3-1:1.0