pidstat: Update non regression tests

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

diff --git a/tests/TLIST b/tests/TLIST
index 03ea58da32cc94ed6f12fafa82f1b82a939f907b..8b1ce60d3e66a3344f3b0eab94c2e23b929089a6 100644 (file)
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -535,7 +535,7 @@ NOTES:
 05175  diff -u tests/out.pidstat-d-TTASK-ALL.tmp tests/expected.pidstat-d-TTASK-ALL
 05180  LC_ALL=C TZ=GMT ./pidstat -uRr -p 1234 1 2 > tests/out.pidstat-p-unkwn.tmp
 05185  diff -u tests/out.pidstat-p-unkwn.tmp tests/expected.pidstat-p-unkwn
-05190  LC_ALL=C TZ=GMT ./pidstat -svw -p 21342,8835 1 2 > tests/out2.pidstat-p-unkwn.tmp
+05190  LC_ALL=C TZ=GMT ./pidstat -svw -p 8741,8835 1 2 > tests/out2.pidstat-p-unkwn.tmp
 05195  diff -u tests/out2.pidstat-p-unkwn.tmp tests/expected2.pidstat-p-unkwn
 05200  LC_ALL=C TZ=GMT ./pidstat -ds -p 8741,21342 1 3 > tests/out.pidstat-p.tmp
 05205  diff -u tests/out.pidstat-p.tmp tests/expected.pidstat-p

diff --git a/tests/expected.pidstat-plist b/tests/expected.pidstat-plist
index 0ea5f15ed820372ceed171eb918ad9ec1bd3fd94..8a93525a1d913522293e12346a6d05b9e492bb8e 100644 (file)
--- a/tests/expected.pidstat-plist
+++ b/tests/expected.pidstat-plist
@@ -1,40 +1,40 @@
 Linux 1.2.3-TEST (SYSSTAT.TEST)        01/01/70        _x86_64_        (8 CPU)
 
 00:00:00      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
+00:00:02     1000      9009         -    0.00    0.00    0.00    0.00    0.00     3  WebExtensions
+00:00:02     1000         -      9009    0.03    0.00    0.00    0.00    0.03     3  |__WebExtensions
+00:00:02     1000         -      9029    0.00    0.00    0.00    0.00    0.00     2  |__Timer
 00:00:02     1000     21342         -    0.00    0.00    0.00    0.00    0.00     5  soffice.bin
 00:00:02     1000         -     21342    0.00    0.00    0.00    0.00    0.00     5  |__soffice.bin
 00:00:02     1000         -     21344    0.00    0.00    0.00    0.00    0.00     5  |__rtl_cache_wsupd
 00:00:02     1000         -     21350    0.00    0.00    0.00    0.00    0.00     4  |__gdbus
-00:00:02     1000      9009         -    0.00    0.00    0.00    0.00    0.00     3  WebExtensions
-00:00:02     1000         -      9009    0.03    0.00    0.00    0.00    0.03     3  |__WebExtensions
-00:00:02     1000         -      9029    0.00    0.00    0.00    0.00    0.00     2  |__Timer
 
 00:00:00      UID      TGID       TID StkSize  StkRef  Command
+00:00:02     1000      9009         -     132      20  WebExtensions
+00:00:02     1000         -      9009     132      20  |__WebExtensions
+00:00:02     1000         -      9029     132      20  |__Timer
 00:00:02     1000     21342         -     132      36  soffice.bin
 00:00:02     1000         -     21342     132      36  |__soffice.bin
 00:00:02     1000         -     21344     132      36  |__rtl_cache_wsupd
 00:00:02     1000         -     21350     132      36  |__gdbus
-00:00:02     1000      9009         -     132      20  WebExtensions
-00:00:02     1000         -      9009     132      20  |__WebExtensions
-00:00:02     1000         -      9029     132      20  |__Timer
 
 00:00:00      UID      TGID       TID   cswch/s nvcswch/s  Command
+00:00:02     1000      9009         -      0.19      0.00  WebExtensions
+00:00:02     1000         -      9009      0.19      0.00  |__WebExtensions
+00:00:02     1000         -      9029      0.32      0.00  |__Timer
 00:00:02     1000     21342         -      0.00      0.00  soffice.bin
 00:00:02     1000         -     21342      0.00      0.00  |__soffice.bin
 00:00:02     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
 00:00:02     1000         -     21350      0.00      0.00  |__gdbus
-00:00:02     1000      9009         -      0.19      0.00  WebExtensions
-00:00:02     1000         -      9009      0.19      0.00  |__WebExtensions
-00:00:02     1000         -      9029      0.32      0.00  |__Timer
 
 00:00:00      UID      TGID       TID threads   fd-nr  Command
+00:00:02     1000      9009         -      32       5  WebExtensions
+00:00:02     1000         -      9009      32       5  |__WebExtensions
+00:00:02     1000         -      9029      32       5  |__Timer
 00:00:02     1000     21342         -       6       5  soffice.bin
 00:00:02     1000         -     21342       6       5  |__soffice.bin
 00:00:02     1000         -     21344       6       5  |__rtl_cache_wsupd
 00:00:02     1000         -     21350       6       5  |__gdbus
-00:00:02     1000      9009         -      32       5  WebExtensions
-00:00:02     1000         -      9009      32       5  |__WebExtensions
-00:00:02     1000         -      9029      32       5  |__Timer
 
 00:00:02      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:04     1000     21342         -    0.00    0.00    0.00    0.00    0.00     5  soffice.bin
@@ -42,7 +42,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 00:00:04     1000         -      8365    0.06    0.00    0.00    0.00    0.06     7  |__evolution-addre
 00:00:04     1000         -     21342    0.00    0.00    0.00    0.00    0.00     5  |__soffice.bin
 00:00:04     1000         -     21350    0.00    0.00    0.00    0.00    0.00     4  |__gdbus
-00:00:04     1000      9009         -    0.00    0.00    0.00    0.00    0.00     3  WebExtensions
 
 00:00:02      UID      TGID       TID StkSize  StkRef  Command
 00:00:04     1000     21342         -     132      36  soffice.bin
@@ -50,7 +49,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 00:00:04     1000         -      8365     132      36  |__evolution-addre
 00:00:04     1000         -     21342     132      36  |__soffice.bin
 00:00:04     1000         -     21350     132      36  |__gdbus
-00:00:04     1000      9009         -     132      20  WebExtensions
 
 00:00:02      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:04     1000     21342         -      0.00      0.00  soffice.bin
@@ -58,7 +56,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 00:00:04     1000         -      8365      0.45      0.03  |__evolution-addre
 00:00:04     1000         -     21342      0.00      0.00  |__soffice.bin
 00:00:04     1000         -     21350      0.00      0.00  |__gdbus
-00:00:04     1000      9009         - 590484765483660416.00      0.00  WebExtensions
 
 00:00:02      UID      TGID       TID threads   fd-nr  Command
 00:00:04     1000     21342         -       6       5  soffice.bin
@@ -66,35 +63,30 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:04     1000         -      8365       5       5  |__evolution-addre
 00:00:04     1000         -     21342       6       5  |__soffice.bin
 00:00:04     1000         -     21350       6       5  |__gdbus
-00:00:04     1000      9009         -      32       5  WebExtensions
 
 00:00:04      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:06     1000     21342         -    0.00    0.00    0.00    0.00    0.00     5  soffice.bin
 00:00:06     1000         -      8364    0.00    0.00    0.00    0.00    0.00     0  |__dconf worker
 00:00:06     1000         -      8365    0.00    0.00    0.00    0.00    0.00     7  |__evolution-addre
 00:00:06     1000         -     21342    0.00    0.00    0.00    0.00    0.00     5  |__soffice.bin
-00:00:06     1000      9009         -    0.00    0.00    0.00    0.00    0.00     3  WebExtensions
 
 00:00:04      UID      TGID       TID StkSize  StkRef  Command
 00:00:06     1000     21342         -     132      36  soffice.bin
 00:00:06     1000         -      8364     132      36  |__dconf worker
 00:00:06     1000         -      8365     132      36  |__evolution-addre
 00:00:06     1000         -     21342     132      36  |__soffice.bin
-00:00:06     1000      9009         -     132      20  WebExtensions
 
 00:00:04      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:06     1000     21342         -      0.00      0.00  soffice.bin
 00:00:06     1000         -      8364      0.00      0.00  |__dconf worker
 00:00:06     1000         -      8365      0.00      0.00  |__evolution-addre
 00:00:06     1000         -     21342      0.00      0.00  |__soffice.bin
-00:00:06     1000      9009         -      0.16      0.00  WebExtensions
 
 00:00:04      UID      TGID       TID threads   fd-nr  Command
 00:00:06     1000     21342         -       6       5  soffice.bin
 00:00:06     1000         -      8364       5       5  |__dconf worker
 00:00:06     1000         -      8365       5       5  |__evolution-addre
 00:00:06     1000         -     21342       6       5  |__soffice.bin
-00:00:06     1000      9009         -      32       5  WebExtensions
 
 00:00:06      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:08     1000     21342         -    0.00    0.00    0.00    0.00    0.00     5  soffice.bin
@@ -102,7 +94,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)      01/01/70        _x86_64_        (8 CPU)
 00:00:08     1000         -      8365    0.00    0.00    0.00    0.00    0.00     7  |__evolution-addre
 00:00:08     1000         -     21342    0.00    0.00    0.00    0.00    0.00     5  |__soffice.bin
 00:00:08     1000         -     21344    0.00    0.00    0.00    0.00    0.00     5  |__rtl_cache_wsupd
-00:00:08     1000      9009         -    0.00    0.00    0.00    0.00    0.00     3  WebExtensions
 
 00:00:06      UID      TGID       TID StkSize  StkRef  Command
 00:00:08     1000     21342         -     132      36  soffice.bin
@@ -110,7 +101,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:08     1000         -      8365     132      36  |__evolution-addre
 00:00:08     1000         -     21342     132      36  |__soffice.bin
 00:00:08     1000         -     21344     132      36  |__rtl_cache_wsupd
-00:00:08     1000      9009         -     132      20  WebExtensions
 
 00:00:06      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:08     1000     21342         -      0.00      0.00  soffice.bin
@@ -118,7 +108,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:08     1000         -      8365      0.00      0.00  |__evolution-addre
 00:00:08     1000         -     21342      0.00      0.00  |__soffice.bin
 00:00:08     1000         -     21344      9.65      0.00  |__rtl_cache_wsupd
-00:00:08     1000      9009         - 823883165418023680.00      0.00  WebExtensions
 
 00:00:06      UID      TGID       TID threads   fd-nr  Command
 00:00:08     1000     21342         -       6       5  soffice.bin
@@ -126,96 +115,75 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:08     1000         -      8365       5       5  |__evolution-addre
 00:00:08     1000         -     21342       6       5  |__soffice.bin
 00:00:08     1000         -     21344       6       5  |__rtl_cache_wsupd
-00:00:08     1000      9009         -      32       5  WebExtensions
 
 00:00:08      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:10     1000     21342         -    0.00    0.00    0.00    0.00    0.00     5  soffice.bin
 00:00:10     1000         -      8365    0.00    0.00    0.00    0.00    0.00     7  |__evolution-addre
 00:00:10     1000         -     21342    0.00    0.00    0.00    0.00    0.00     5  |__soffice.bin
 00:00:10     1000         -     21344    0.00    0.00    0.00    0.00    0.00     5  |__rtl_cache_wsupd
-00:00:10     1000      9009         -    0.00    0.00    0.00    0.00    0.00     3  WebExtensions
 
 00:00:08      UID      TGID       TID StkSize  StkRef  Command
 00:00:10     1000     21342         -     132      36  soffice.bin
 00:00:10     1000         -      8365     132      36  |__evolution-addre
 00:00:10     1000         -     21342     132      36  |__soffice.bin
 00:00:10     1000         -     21344     132      36  |__rtl_cache_wsupd
-00:00:10     1000      9009         -     132      20  WebExtensions
 
 00:00:08      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:10     1000     21342         -      0.00      0.00  soffice.bin
 00:00:10     1000         -      8365      0.00      0.00  |__evolution-addre
 00:00:10     1000         -     21342      0.00      0.00  |__soffice.bin
 00:00:10     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
-00:00:10     1000      9009         -      0.00      0.00  WebExtensions
 
 00:00:08      UID      TGID       TID threads   fd-nr  Command
 00:00:10     1000     21342         -       6       5  soffice.bin
 00:00:10     1000         -      8365       5       5  |__evolution-addre
 00:00:10     1000         -     21342       6       5  |__soffice.bin
 00:00:10     1000         -     21344       6       5  |__rtl_cache_wsupd
-00:00:10     1000      9009         -      32       5  WebExtensions
 
 00:00:10      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:12     1000     21342         -    0.00    0.00    0.00    0.00    0.00     5  soffice.bin
 00:00:12     1000         -      8365    0.00    0.00    0.00    0.00    0.00     7  |__evolution-addre
 00:00:12     1000         -     21342    0.00    0.00    0.00    0.00    0.00     5  |__soffice.bin
 00:00:12     1000         -     21344    0.00    0.00    0.00    0.00    0.00     5  |__rtl_cache_wsupd
-00:00:12     1000         -     21344    0.00    0.00    0.00    0.00    0.00     5  |__rtl_cache_wsupd
-00:00:12     1000      9009         -    0.00    0.00    0.00    0.00    0.00     3  WebExtensions
 
 00:00:10      UID      TGID       TID StkSize  StkRef  Command
 00:00:12     1000     21342         -     132      36  soffice.bin
 00:00:12     1000         -      8365     132      36  |__evolution-addre
 00:00:12     1000         -     21342     132      36  |__soffice.bin
 00:00:12     1000         -     21344     132      36  |__rtl_cache_wsupd
-00:00:12     1000         -     21344     132      36  |__rtl_cache_wsupd
-00:00:12     1000      9009         -     132      20  WebExtensions
 
 00:00:10      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:12     1000     21342         -      0.00      0.00  soffice.bin
 00:00:12     1000         -      8365      0.00      0.00  |__evolution-addre
 00:00:12     1000         -     21342      0.00      0.00  |__soffice.bin
 00:00:12     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
-00:00:12     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
-00:00:12     1000      9009         - 591810846124785152.00      0.00  WebExtensions
 
 00:00:10      UID      TGID       TID threads   fd-nr  Command
 00:00:12     1000     21342         -       6       5  soffice.bin
 00:00:12     1000         -      8365       5       5  |__evolution-addre
 00:00:12     1000         -     21342       6       5  |__soffice.bin
 00:00:12     1000         -     21344       6       5  |__rtl_cache_wsupd
-00:00:12     1000         -     21344       6       5  |__rtl_cache_wsupd
-00:00:12     1000      9009         -      32       5  WebExtensions
 
 Average:      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 Average:     1000     21342         -    0.00    0.00    0.00    0.00    0.00     -  soffice.bin
 Average:     1000         -      8365    0.06    0.00    0.00    0.00    0.06     -  |__evolution-addre
 Average:     1000         -     21342    0.00    0.00    0.00    0.00    0.00     -  |__soffice.bin
 Average:     1000         -     21344    0.00    0.00    0.00    0.00    0.00     -  |__rtl_cache_wsupd
-Average:     1000         -     21344    0.00    0.00    0.00    0.00    0.00     -  |__rtl_cache_wsupd
-Average:     1000      9009         -    0.00    0.00    0.00    0.00    0.00     -  WebExtensions
 
 Average:      UID      TGID       TID StkSize  StkRef  Command
 Average:     1000     21342         -     132      36  soffice.bin
 Average:     1000         -      8365     132      36  |__evolution-addre
 Average:     1000         -     21342     132      36  |__soffice.bin
 Average:     1000         -     21344     132      36  |__rtl_cache_wsupd
-Average:     1000         -     21344     132      36  |__rtl_cache_wsupd
-Average:     1000      9009         -     132      20  WebExtensions
 
 Average:      UID      TGID       TID   cswch/s nvcswch/s  Command
 Average:     1000     21342         -      0.00      0.00  soffice.bin
 Average:     1000         -      8365      0.45      0.03  |__evolution-addre
 Average:     1000         -     21342      0.00      0.00  |__soffice.bin
-Average:     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
-Average:     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
-Average:     1000      9009         -      0.00      0.00  WebExtensions
+Average:     1000         -     21344      6.93      0.00  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID threads   fd-nr  Command
 Average:     1000     21342         -       6       5  soffice.bin
 Average:     1000         -      8365       5       5  |__evolution-addre
 Average:     1000         -     21342       6       5  |__soffice.bin
 Average:     1000         -     21344       6       5  |__rtl_cache_wsupd
-Average:     1000         -     21344       6       5  |__rtl_cache_wsupd
-Average:     1000      9009         -      32       5  WebExtensions

diff --git a/tests/expected1.pidstat b/tests/expected1.pidstat
index 3ae52675f56c9c68a522d2057b140da64a28cd12..a612d98851badac64ef51608f63e3271d0c0cddb 100644 (file)
--- a/tests/expected1.pidstat
+++ b/tests/expected1.pidstat
@@ -65,22 +65,24 @@ Average:      UID       PID    %usr %system  %guest   %wait    %CPU   CPU  Comma
 Average:     1000      7900  111.56   16.68    0.00    2.64  128.24     -  gnome-shell
 Average:        0      8407    0.19    0.02    0.00    0.01    0.21     -  gnome-terminal-
 Average:     1000      8741    0.04    0.01    0.00    0.01    0.05     -  firefox
-Average:     1000      9009    0.01    0.00    0.00    0.00    0.01     -  WebExtensions
+Average:     1000      9009    4.48    2.20    0.00    0.59    6.68     -  WebExtensions
 
 Average:      UID       PID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 Average:     1000      7900   7925.82      0.46 4451763  259072   3.18  gnome-shell
 Average:        0      8407      0.09      0.00  723868   42156   0.52  gnome-terminal-
 Average:     1000      8741      0.05      0.00 2535720  335804   4.12  firefox
-Average:     1000      9009      0.02      0.00 1744508  105628   1.30  WebExtensions
+Average:     1000      9009    245.57      0.14 1744508  105628   1.30  WebExtensions
 
 Average:      UID       PID StkSize  StkRef  Command
 Average:     1000      7900     128     108  gnome-shell
+Average:     1000      9009     132      20  WebExtensions
 
 Average:      UID       PID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
 Average:     1000      7900    127.20      0.87      0.00      84  gnome-shell
+Average:     1000      9009     11.69      0.00      0.00      69  WebExtensions
 
 Average:      UID       PID   cswch/s nvcswch/s  Command
 Average:     1000      7900   1769.08    220.92  gnome-shell
 Average:        0      8407      2.74      0.02  gnome-terminal-
 Average:     1000      8741      2.87      0.00  firefox
-Average:     1000      9009      0.63      0.00  WebExtensions
+Average:     1000      9009    240.12      4.54  WebExtensions

diff --git a/tests/expected1.pidstat-At b/tests/expected1.pidstat-At
index d57a23605438e857bf8daca0957749f5ad2f79a3..bb9efc232458950eeb99738d25bd7fa1064d8917 100644 (file)
--- a/tests/expected1.pidstat-At
+++ b/tests/expected1.pidstat-At
@@ -5,8 +5,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)         01/01/70        _x86_64_        (8 CPU)
 00:00:02     1000         -      7900  349.70   51.43    0.00    8.47  401.12     2  |__gnome-shell
 00:00:02        0      8407         -    0.35    0.03    0.00    0.00    0.38     0  gnome-terminal-
 00:00:02        0         -      8407    0.35    0.03    0.00    0.00    0.38     0  |__gnome-terminal-
-00:00:02     1000         -      8741    0.03    0.00    0.00    0.00    0.03     0  |__firefox
-00:00:02     1000         -      9009    0.03    0.00    0.00    0.00    0.03     3  |__WebExtensions
+00:00:02     1000      8741      8741    0.03    0.00    0.00    0.00    0.03     0  (firefox)__firefox
+00:00:02     1000      9009      9009    0.03    0.00    0.00    0.00    0.03     3  (WebExtensions)__WebExtensions
 
 00:00:00      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:02     1000      7900         -  25095.93      1.48 4453984  259044   3.18  gnome-shell
@@ -58,7 +58,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407    0.19    0.00    0.00    0.00    0.19     3  |__gnome-terminal-
 00:00:04     1000      8741         -    0.13    0.03    0.00    0.03    0.16     5  firefox
 00:00:04     1000         -      8741    0.06    0.00    0.00    0.03    0.06     5  |__firefox
-00:00:04     1000         -      8365    0.06    0.00    0.00    0.00    0.06     7  |__evolution-addre
+00:00:04     1000     21342      8365    0.06    0.00    0.00    0.00    0.06     7  (soffice.bin)__evolution-addre
 
 00:00:02      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:04     1000      7900         -    169.05      0.00 4449368  259096   3.18  gnome-shell
@@ -67,16 +67,16 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407      0.13      0.00  723868   42156   0.52  |__gnome-terminal-
 00:00:04     1000      8741         -      0.16      0.00 2535720  335804   4.12  firefox
 00:00:04     1000         -      8741      0.16      0.00 2535720  335804   4.12  |__firefox
-00:00:04     1000         -      8364      0.42      0.00 1264684   46212   0.57  |__dconf worker
+00:00:04     1000     21342      8364      0.42      0.00 1264684   46212   0.57  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365      8.90      0.00 1264684   46212   0.57  |__evolution-addre
 
 00:00:02      UID      TGID       TID StkSize  StkRef  Command
-00:00:04     1000         -      8364     132      36  |__dconf worker
+00:00:04     1000     21342      8364     132      36  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365     132      36  |__evolution-addre
 
 00:00:02      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:04     1000         -     10334      0.00      0.00      0.00       0  |__dconf worker
-00:00:04     1000         -      8364      0.13      0.01      0.00       0  |__dconf worker
+00:00:04     1000      7900     10334      0.00      0.00      0.00       0  (gnome-shell)__dconf worker
+00:00:04     1000     21342      8364      0.13      0.01      0.00       0  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365      0.27      0.14      0.00       0  |__evolution-addre
 
 00:00:02      UID      TGID       TID   cswch/s nvcswch/s  Command
@@ -86,11 +86,11 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407      2.34      0.00  |__gnome-terminal-
 00:00:04     1000      8741         -      7.68      0.00  firefox
 00:00:04     1000         -      8741      7.68      0.00  |__firefox
-00:00:04     1000         -      8364      0.51      0.00  |__dconf worker
+00:00:04     1000     21342      8364      0.51      0.00  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365      0.45      0.03  |__evolution-addre
 
 00:00:02      UID      TGID       TID threads   fd-nr  Command
-00:00:04     1000         -      8364       5       5  |__dconf worker
+00:00:04     1000     21342      8364       5       5  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365       5       5  |__evolution-addre
 
 00:00:02      UID      TGID       TID prio policy  Command
@@ -100,14 +100,14 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:06     1000         -      7900    0.83    0.23    0.00    0.00    1.06     0  |__gnome-shell
 00:00:06        0      8407         -    0.05    0.03    0.00    0.03    0.08     4  gnome-terminal-
 00:00:06        0         -      8407    0.05    0.03    0.00    0.03    0.08     4  |__gnome-terminal-
-00:00:06     1000         -      8785    0.00 479136209706741632.00    0.00    0.00 479136209706741632.00     5  |__disk_cache:0
+00:00:06     1000      8741      8785    0.00 479136209706741632.00    0.00    0.00 479136209706741632.00     5  (firefox)__disk_cache:0
 00:00:06     1000      9009         -   11.74    5.77    0.00    1.56   17.51     3  WebExtensions
 00:00:06     1000         -      9009    8.91    2.62    0.00    1.56   11.53     3  |__WebExtensions
 
 00:00:04      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:06     1000      7900         -    318.81      0.00 4451936  259076   3.18  gnome-shell
 00:00:06     1000         -      7900    318.81      0.00 4451936  259076   3.18  |__gnome-shell
-00:00:06     1000         -      8785 479136209706741376.00 479136209706741632.00 1432632   51352   0.63  |__disk_cache:0
+00:00:06     1000      8741      8785 479136209706741376.00 479136209706741632.00 1432632   51352   0.63  (firefox)__disk_cache:0
 00:00:06     1000         -      9109      0.00      0.00 2535720  335804   4.12  |__DOM Worker
 00:00:06     1000      9009         -    643.64      0.36 1744508  105628   1.30  WebExtensions
 00:00:06     1000         -      9009    497.95      0.26 1744508  105628   1.30  |__WebExtensions
@@ -119,23 +119,23 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:06     1000         -      9033     132      20  |__ImageIO
 
 00:00:04      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:06     1000         -      8785 467906454791736.25      0.05      0.00 18446744073709551611  |__disk_cache:0
+00:00:06     1000      8741      8785 467906454791736.25      0.05      0.00 18446744073709551611  (firefox)__disk_cache:0
 00:00:06     1000      9009         -     30.65      0.00      0.00      69  WebExtensions
 00:00:06     1000         -      9009     24.52      0.00      0.00      69  |__WebExtensions
-00:00:06     1000         -      8364      0.05      0.00      0.00       0  |__dconf worker
+00:00:06     1000     21342      8364      0.05      0.00      0.00       0  (soffice.bin)__dconf worker
 
 00:00:04      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:06     1000      7900         -     11.71      6.81  gnome-shell
 00:00:06     1000         -      7900     11.71      6.81  |__gnome-shell
 00:00:06        0      8407         -      1.22      0.00  gnome-terminal-
 00:00:06        0         -      8407      1.22      0.00  |__gnome-terminal-
-00:00:06     1000         -      8785 479136209706741632.00 479136209706741632.00  |__disk_cache:0
+00:00:06     1000      8741      8785 479136209706741632.00 479136209706741632.00  (firefox)__disk_cache:0
 00:00:06     1000      9009         -    629.38     11.90  WebExtensions
 00:00:06     1000         -      9009    629.38     11.90  |__WebExtensions
 00:00:06     1000         -      9033      0.03      0.00  |__ImageIO
 
 00:00:04      UID      TGID       TID threads   fd-nr  Command
-00:00:06     1000         -      8785       5       5  |__disk_cache:0
+00:00:06     1000      8741      8785       5       5  (firefox)__disk_cache:0
 00:00:06     1000         -      8789      66       5  |__Link Monitor
 00:00:06     1000         -      8835      66       5  |__ImgDecoder #1
 00:00:06     1000         -      9109      66       5  |__DOM Worker
@@ -144,7 +144,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:06     1000         -      9033      32       5  |__ImageIO
 
 00:00:04      UID      TGID       TID prio policy  Command
-00:00:06     1000         -      8785    0   IDLE  |__disk_cache:0
+00:00:06     1000      8741      8785    0   IDLE  (firefox)__disk_cache:0
 
 00:00:06      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:08     1000      7900         -    3.31    0.71    0.00    0.09    4.02     5  gnome-shell
@@ -157,20 +157,20 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:06      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:08     1000      7900         -    736.85      0.00 4448816  259144   3.18  gnome-shell
 00:00:08     1000         -      7900    743.28      0.00 4450840  259144   3.18  |__gnome-shell
-00:00:08     1000         -      8789      0.00      0.00 2524288  330644   4.06  |__Link Monitor
+00:00:08     1000      8741      8789      0.00      0.00 2524288  330644   4.06  (firefox)__Link Monitor
 00:00:08     1000         -      8835      0.00      0.00 2524288  330644   4.06  |__ImgDecoder #1
 00:00:08     1000         -      9109      0.00      0.00 2524288  330644   4.06  |__DOM Worker
 00:00:08     1000      9009         -      5.09      0.00 1744508  106108   1.30  WebExtensions
 00:00:08     1000         -      9009      5.09      0.00 1744508  106108   1.30  |__WebExtensions
 00:00:08     1000         -      9033      0.00      0.00 1744508  106108   1.30  |__ImageIO
-00:00:08     1000         -     21344      0.40      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344      0.40      0.00 1790688  439484   5.40  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID StkSize  StkRef  Command
-00:00:08     1000         -     21344     132      36  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344     132      36  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:08     1000         -      8785      0.00      0.00      0.00       0  |__disk_cache:0
-00:00:08     1000         -      8364      0.00      0.00      0.00       0  |__dconf worker
+00:00:08     1000      8741      8785      0.00      0.00      0.00       0  (firefox)__disk_cache:0
+00:00:08     1000     21342      8364      0.00      0.00      0.00       0  (soffice.bin)__dconf worker
 
 00:00:06      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:08     1000      7900         -     43.77     17.87  gnome-shell
@@ -179,13 +179,13 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:08        0         -      8407      2.28      0.00  |__gnome-terminal-
 00:00:08     1000      9009         -      2.81      0.04  WebExtensions
 00:00:08     1000         -      9009      2.81      0.04  |__WebExtensions
-00:00:08     1000         -     21344      9.65      0.00  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344      9.65      0.00  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID threads   fd-nr  Command
-00:00:08     1000         -      8789      69       5  |__Link Monitor
+00:00:08     1000      8741      8789      69       5  (firefox)__Link Monitor
 00:00:08     1000         -      8835      69       5  |__ImgDecoder #1
 00:00:08     1000         -      9109      69       5  |__DOM Worker
-00:00:08     1000         -     21344       6       5  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344       6       5  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID prio policy  Command
 
@@ -194,22 +194,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:10        0         -      8407    0.00    0.00    0.00    0.00    0.00     2  |__gnome-terminal-
 
 00:00:08      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
-00:00:10     1000         -      8789      0.00      0.00 2524532  339528   4.17  |__Link Monitor
+00:00:10     1000      8741      8789      0.00      0.00 2524532  339528   4.17  (firefox)__Link Monitor
 00:00:10     1000         -      8835      0.00      0.00 2524532  339528   4.17  |__ImgDecoder #1
 00:00:10     1000         -      9109      0.00      0.00 2524532  339528   4.17  |__DOM Worker
 
 00:00:08      UID      TGID       TID StkSize  StkRef  Command
 
 00:00:08      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:10     1000         -      8785      0.00      0.00      0.00       0  |__disk_cache:0
+00:00:10     1000      8741      8785      0.00      0.00      0.00       0  (firefox)__disk_cache:0
 
 00:00:08      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:10        0      8407         -      0.00      0.00  gnome-terminal-
 00:00:10        0         -      8407      0.00      0.00  |__gnome-terminal-
-00:00:10     1000         -      8835      0.00      0.00  |__ImgDecoder #1
+00:00:10     1000      8741      8835      0.00      0.00  (firefox)__ImgDecoder #1
 
 00:00:08      UID      TGID       TID threads   fd-nr  Command
-00:00:10     1000         -      8789      70       5  |__Link Monitor
+00:00:10     1000      8741      8789      70       5  (firefox)__Link Monitor
 00:00:10     1000         -      8835      70       5  |__ImgDecoder #1
 00:00:10     1000         -      9109      70       5  |__DOM Worker
 
@@ -222,21 +222,21 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:10      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:12        0      8407         -      0.03      0.00  723868   42156   0.52  gnome-terminal-
 00:00:12        0         -      8407      0.03      0.00  723868   42156   0.52  |__gnome-terminal-
-00:00:12     1000         -      8789      0.00      0.00 2534716  342460   4.20  |__Link Monitor
+00:00:12     1000      8741      8789      0.00      0.00 2534716  342460   4.20  (firefox)__Link Monitor
 00:00:12     1000         -      8835      0.00      0.00 2534716  342460   4.20  |__ImgDecoder #1
 00:00:12     1000         -      9109      0.00      0.00 2534716  342460   4.20  |__DOM Worker
 
 00:00:10      UID      TGID       TID StkSize  StkRef  Command
 
 00:00:10      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:12     1000         -      8785      0.00      0.00      0.00       0  |__disk_cache:0
+00:00:12     1000      8741      8785      0.00      0.00      0.00       0  (firefox)__disk_cache:0
 
 00:00:10      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:12        0      8407         -      2.34      0.00  gnome-terminal-
 00:00:12        0         -      8407      2.31      0.00  |__gnome-terminal-
 
 00:00:10      UID      TGID       TID threads   fd-nr  Command
-00:00:12     1000         -      8789      71       5  |__Link Monitor
+00:00:12     1000      8741      8789      71       5  (firefox)__Link Monitor
 00:00:12     1000         -      8835      71       5  |__ImgDecoder #1
 00:00:12     1000         -      9109      71       5  |__DOM Worker
 
@@ -248,7 +248,7 @@ Average:        0         -      8407    0.77    0.06    0.00    0.03    0.83
 Average:     1000      8741         -    0.13    0.03    0.00    0.03    0.16     -  firefox
 Average:     1000         -      8741    0.10    0.00    0.00    0.03    0.10     -  |__firefox
 Average:     1000         -      8785    0.00 591810846124785152.00    0.00    0.00 591810846124785152.00     -  |__disk_cache:0
-Average:     1000         -      8365    0.06    0.00    0.00    0.00    0.06     -  |__evolution-addre
+Average:     1000     21342      8365    0.06    0.00    0.00    0.00    0.06     -  (soffice.bin)__evolution-addre
 
 Average:      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 Average:        0      8407         -      0.32      0.00  723868   42156   0.52  gnome-terminal-
@@ -259,14 +259,16 @@ Average:     1000         -      8785 591810846124784896.00 591810846124785152.0
 Average:     1000         -      8789      0.00      0.00 2531783  336674   4.13  |__Link Monitor
 Average:     1000         -      8835      0.10      0.00 2531783  336674   4.13  |__ImgDecoder #1
 Average:     1000         -      9109      0.00      0.00 2531785  336674   4.13  |__DOM Worker
-Average:     1000         -      8365      8.92      0.00 1264684   46212   0.57  |__evolution-addre
+Average:     1000     21342      8365      8.92      0.00 1264684   46212   0.57  (soffice.bin)__evolution-addre
+Average:     1000         -     21344      0.29      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID StkSize  StkRef  Command
-Average:     1000         -      8365     132      36  |__evolution-addre
+Average:     1000     21342      8365     132      36  (soffice.bin)__evolution-addre
+Average:     1000         -     21344     132      36  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-Average:     1000         -      8785 577940279418731.00      0.06      0.00 3074457345618258432  |__disk_cache:0
-Average:     1000         -      8365      0.27      0.14      0.00       0  |__evolution-addre
+Average:     1000      8741      8785 577940279418731.00      0.06      0.00 3074457345618258432  (firefox)__disk_cache:0
+Average:     1000     21342      8365      0.27      0.14      0.00       0  (soffice.bin)__evolution-addre
 
 Average:      UID      TGID       TID   cswch/s nvcswch/s  Command
 Average:        0      8407         -     15.01      0.06  gnome-terminal-
@@ -275,14 +277,16 @@ Average:     1000      8741         -      9.30      0.00  firefox
 Average:     1000         -      8741      9.30      0.00  |__firefox
 Average:     1000         -      8785 591810846124785152.00 591810846124785152.00  |__disk_cache:0
 Average:     1000         -      8835      0.06      0.00  |__ImgDecoder #1
-Average:     1000         -      8365      0.45      0.03  |__evolution-addre
+Average:     1000     21342      8365      0.45      0.03  (soffice.bin)__evolution-addre
+Average:     1000         -     21344      6.93      0.00  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID threads   fd-nr  Command
-Average:     1000         -      8785      26       5  |__disk_cache:0
+Average:     1000      8741      8785      26       5  (firefox)__disk_cache:0
 Average:     1000         -      8789      68       5  |__Link Monitor
 Average:     1000         -      8835      68       5  |__ImgDecoder #1
 Average:     1000         -      9109      68       5  |__DOM Worker
-Average:     1000         -      8365       5       5  |__evolution-addre
+Average:     1000     21342      8365       5       5  (soffice.bin)__evolution-addre
+Average:     1000         -     21344       6       5  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID prio policy  Command
-Average:     1000         -      8785    0   IDLE  |__disk_cache:0
+Average:     1000      8741      8785    0   IDLE  (firefox)__disk_cache:0

diff --git a/tests/expected1.pidstat-At-TALL-ALL b/tests/expected1.pidstat-At-TALL-ALL
index d013624cc732906a5e13e2e9742fa30196dc1ff8..2102cdb537f587485f943a4d01b39bc1f2dd301e 100644 (file)
--- a/tests/expected1.pidstat-At-TALL-ALL
+++ b/tests/expected1.pidstat-At-TALL-ALL
@@ -971,7 +971,7 @@ Average:     1000         -      9109         0         0         0  |__DOM Work
 Average:     1000     21342         -         0         0         0  soffice.bin
 Average:     1000         -      8365         4         0         0  |__evolution-addre
 Average:     1000         -     21342         0         0         0  |__soffice.bin
-Average:     1000         -     21344         0         0         0  |__rtl_cache_wsupd
+Average:     1000         -     21344        33        13         0  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 Average:        0      8407         -      0.32      0.00  723868   42156   0.52  gnome-terminal-
@@ -985,7 +985,7 @@ Average:     1000         -      9109      0.00      0.00 2531785  336674   4.13
 Average:     1000     21342         -      0.00      0.00 1790688  439484   5.40  soffice.bin
 Average:     1000         -      8365      8.92      0.00 1264684   46212   0.57  |__evolution-addre
 Average:     1000         -     21342      0.00      0.00 1790688  439484   5.40  |__soffice.bin
-Average:     1000         -     21344      0.00      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
+Average:     1000         -     21344      0.29      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID minflt-nr majflt-nr  Command
 Average:        0      8407         -         2         0  gnome-terminal-
@@ -999,7 +999,7 @@ Average:     1000         -      9109         0         0  |__DOM Worker
 Average:     1000     21342         -         0         0  soffice.bin
 Average:     1000         -      8365        56         0  |__evolution-addre
 Average:     1000         -     21342         0         0  |__soffice.bin
-Average:     1000         -     21344         0         0  |__rtl_cache_wsupd
+Average:     1000         -     21344       832         0  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID StkSize  StkRef  Command
 Average:        0      8407         -     132     120  gnome-terminal-
@@ -1041,7 +1041,7 @@ Average:     1000         -      9109      0.00      0.00  |__DOM Worker
 Average:     1000     21342         -      0.00      0.00  soffice.bin
 Average:     1000         -      8365      0.45      0.03  |__evolution-addre
 Average:     1000         -     21342      0.00      0.00  |__soffice.bin
-Average:     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
+Average:     1000         -     21344      6.93      0.00  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID threads   fd-nr  Command
 Average:        0      8407         -       4       5  gnome-terminal-

diff --git a/tests/expected1.pidstat-At-TCHILD b/tests/expected1.pidstat-At-TCHILD
index 00df46ffaeae1817705e14d0a3cb060883aa020a..5c46319afb3d736db5322fb56658e54cfc4a24f2 100644 (file)
--- a/tests/expected1.pidstat-At-TCHILD
+++ b/tests/expected1.pidstat-At-TCHILD
@@ -6,8 +6,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)         01/01/70        _x86_64_        (8 CPU)
 00:00:02     1000         -     10334       410       120         0  |__dconf worker
 00:00:02        0      8407         -       110        10         0  gnome-terminal-
 00:00:02        0         -      8407       110        10         0  |__gnome-terminal-
-00:00:02     1000         -      8741        10         0         0  |__firefox
-00:00:02     1000         -      9009        10         0         0  |__WebExtensions
+00:00:02     1000      8741      8741        10         0         0  (firefox)__firefox
+00:00:02     1000      9009      9009        10         0         0  (WebExtensions)__WebExtensions
 
 00:00:00      UID      TGID       TID minflt-nr majflt-nr  Command
 00:00:02     1000      7900         -    785212        49  gnome-shell
@@ -25,7 +25,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407        60         0         0  |__gnome-terminal-
 00:00:04     1000      8741         -        40        10         0  firefox
 00:00:04     1000         -      8741        20         0         0  |__firefox
-00:00:04     1000         -      8365        20         0         0  |__evolution-addre
+00:00:04     1000     21342      8365        20         0         0  (soffice.bin)__evolution-addre
 
 00:00:02      UID      TGID       TID minflt-nr majflt-nr  Command
 00:00:04     1000      7900         -      5281         0  gnome-shell
@@ -34,7 +34,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407         4         0  |__gnome-terminal-
 00:00:04     1000      8741         -         5         0  firefox
 00:00:04     1000         -      8741         5         0  |__firefox
-00:00:04     1000         -      8364        13         0  |__dconf worker
+00:00:04     1000     21342      8364        13         0  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365       278         0  |__evolution-addre
 
 00:00:04      UID      TGID       TID    usr-ms system-ms  guest-ms  Command
@@ -42,14 +42,14 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:06     1000         -      7900       320        90         0  |__gnome-shell
 00:00:06        0      8407         -        20        10         0  gnome-terminal-
 00:00:06        0         -      8407        20        10         0  |__gnome-terminal-
-00:00:06     1000         -      8785         0 184467440737095483392         0  |__disk_cache:0
+00:00:06     1000      8741      8785         0 184467440737095483392         0  (firefox)__disk_cache:0
 00:00:06     1000      9009         -      4520      2220         0  WebExtensions
 00:00:06     1000         -      9009      3430      1010         0  |__WebExtensions
 
 00:00:04      UID      TGID       TID minflt-nr majflt-nr  Command
 00:00:06     1000      7900         -     12274         0  gnome-shell
 00:00:06     1000         -      7900     12274         0  |__gnome-shell
-00:00:06     1000         -      8785 18446744073708206385 18446744073709551507  |__disk_cache:0
+00:00:06     1000      8741      8785 18446744073708206385 18446744073709551507  (firefox)__disk_cache:0
 00:00:06     1000      9009         -     24780        14  WebExtensions
 00:00:06     1000         -      9009     19171        10  |__WebExtensions
 00:00:06     1000         -      9033         1         0  |__ImageIO
@@ -61,21 +61,21 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:08        0         -      8407        10         0         0  |__gnome-terminal-
 00:00:08     1000      9009         -        10        10         0  WebExtensions
 00:00:08     1000         -      9009        10        10         0  |__WebExtensions
-00:00:08     1000         -     21344       100        40         0  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344       100        40         0  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID minflt-nr majflt-nr  Command
 00:00:08     1000      7900         -     16498         0  gnome-shell
 00:00:08     1000         -      7900     16642         0  |__gnome-shell
 00:00:08     1000      9009         -       114         0  WebExtensions
 00:00:08     1000         -      9009       114         0  |__WebExtensions
-00:00:08     1000         -     21344      2497         1  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344      2497         1  (soffice.bin)__rtl_cache_wsupd
 
 00:00:08      UID      TGID       TID    usr-ms system-ms  guest-ms  Command
 00:00:10        0      8407         -        20         0         0  gnome-terminal-
 00:00:10        0         -      8407        20         0         0  |__gnome-terminal-
 
 00:00:08      UID      TGID       TID minflt-nr majflt-nr  Command
-00:00:10     1000         -      8835         3         0  |__ImgDecoder #1
+00:00:10     1000      8741      8835         3         0  (firefox)__ImgDecoder #1
 
 00:00:10      UID      TGID       TID    usr-ms system-ms  guest-ms  Command
 00:00:12        0      8407         -        20         0         0  gnome-terminal-
@@ -91,7 +91,8 @@ Average:        0         -      8407        40         3         0  |__gnome-te
 Average:     1000      8741         -         7         2         0  firefox
 Average:     1000         -      8741         5         0         0  |__firefox
 Average:     1000         -      8785         0 30744573456182583296         0  |__disk_cache:0
-Average:     1000         -      8365         4         0         0  |__evolution-addre
+Average:     1000     21342      8365         4         0         0  (soffice.bin)__evolution-addre
+Average:     1000         -     21344        33        13         0  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID minflt-nr majflt-nr  Command
 Average:        0      8407         -         2         0  gnome-terminal-
@@ -100,4 +101,5 @@ Average:     1000      8741         -         1         0  firefox
 Average:     1000         -      8741         1         0  |__firefox
 Average:     1000         -      8785 3074457345618034176 3074457345618258432  |__disk_cache:0
 Average:     1000         -      8835         0         0  |__ImgDecoder #1
-Average:     1000         -      8365        56         0  |__evolution-addre
+Average:     1000     21342      8365        56         0  (soffice.bin)__evolution-addre
+Average:     1000         -     21344       832         0  |__rtl_cache_wsupd

diff --git a/tests/expected1.pidstat-At-TCHILD-ALL b/tests/expected1.pidstat-At-TCHILD-ALL
index 7d987f950bb21ebac161d9b147e32a5a250c1617..19ac38dea83ee7dec0161635733e19bb3345179f 100644 (file)
--- a/tests/expected1.pidstat-At-TCHILD-ALL
+++ b/tests/expected1.pidstat-At-TCHILD-ALL
@@ -222,7 +222,7 @@ Average:     1000         -      9109         0         0         0  |__DOM Work
 Average:     1000     21342         -         0         0         0  soffice.bin
 Average:     1000         -      8365         4         0         0  |__evolution-addre
 Average:     1000         -     21342         0         0         0  |__soffice.bin
-Average:     1000         -     21344         0         0         0  |__rtl_cache_wsupd
+Average:     1000         -     21344        33        13         0  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID minflt-nr majflt-nr  Command
 Average:        0      8407         -         2         0  gnome-terminal-
@@ -236,4 +236,4 @@ Average:     1000         -      9109         0         0  |__DOM Worker
 Average:     1000     21342         -         0         0  soffice.bin
 Average:     1000         -      8365        56         0  |__evolution-addre
 Average:     1000         -     21342         0         0  |__soffice.bin
-Average:     1000         -     21344         0         0  |__rtl_cache_wsupd
+Average:     1000         -     21344       832         0  |__rtl_cache_wsupd

diff --git a/tests/expected1.pidstat-At-TTASK b/tests/expected1.pidstat-At-TTASK
index d57a23605438e857bf8daca0957749f5ad2f79a3..bb9efc232458950eeb99738d25bd7fa1064d8917 100644 (file)
--- a/tests/expected1.pidstat-At-TTASK
+++ b/tests/expected1.pidstat-At-TTASK
@@ -5,8 +5,8 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)         01/01/70        _x86_64_        (8 CPU)
 00:00:02     1000         -      7900  349.70   51.43    0.00    8.47  401.12     2  |__gnome-shell
 00:00:02        0      8407         -    0.35    0.03    0.00    0.00    0.38     0  gnome-terminal-
 00:00:02        0         -      8407    0.35    0.03    0.00    0.00    0.38     0  |__gnome-terminal-
-00:00:02     1000         -      8741    0.03    0.00    0.00    0.00    0.03     0  |__firefox
-00:00:02     1000         -      9009    0.03    0.00    0.00    0.00    0.03     3  |__WebExtensions
+00:00:02     1000      8741      8741    0.03    0.00    0.00    0.00    0.03     0  (firefox)__firefox
+00:00:02     1000      9009      9009    0.03    0.00    0.00    0.00    0.03     3  (WebExtensions)__WebExtensions
 
 00:00:00      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:02     1000      7900         -  25095.93      1.48 4453984  259044   3.18  gnome-shell
@@ -58,7 +58,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407    0.19    0.00    0.00    0.00    0.19     3  |__gnome-terminal-
 00:00:04     1000      8741         -    0.13    0.03    0.00    0.03    0.16     5  firefox
 00:00:04     1000         -      8741    0.06    0.00    0.00    0.03    0.06     5  |__firefox
-00:00:04     1000         -      8365    0.06    0.00    0.00    0.00    0.06     7  |__evolution-addre
+00:00:04     1000     21342      8365    0.06    0.00    0.00    0.00    0.06     7  (soffice.bin)__evolution-addre
 
 00:00:02      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:04     1000      7900         -    169.05      0.00 4449368  259096   3.18  gnome-shell
@@ -67,16 +67,16 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407      0.13      0.00  723868   42156   0.52  |__gnome-terminal-
 00:00:04     1000      8741         -      0.16      0.00 2535720  335804   4.12  firefox
 00:00:04     1000         -      8741      0.16      0.00 2535720  335804   4.12  |__firefox
-00:00:04     1000         -      8364      0.42      0.00 1264684   46212   0.57  |__dconf worker
+00:00:04     1000     21342      8364      0.42      0.00 1264684   46212   0.57  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365      8.90      0.00 1264684   46212   0.57  |__evolution-addre
 
 00:00:02      UID      TGID       TID StkSize  StkRef  Command
-00:00:04     1000         -      8364     132      36  |__dconf worker
+00:00:04     1000     21342      8364     132      36  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365     132      36  |__evolution-addre
 
 00:00:02      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:04     1000         -     10334      0.00      0.00      0.00       0  |__dconf worker
-00:00:04     1000         -      8364      0.13      0.01      0.00       0  |__dconf worker
+00:00:04     1000      7900     10334      0.00      0.00      0.00       0  (gnome-shell)__dconf worker
+00:00:04     1000     21342      8364      0.13      0.01      0.00       0  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365      0.27      0.14      0.00       0  |__evolution-addre
 
 00:00:02      UID      TGID       TID   cswch/s nvcswch/s  Command
@@ -86,11 +86,11 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:04        0         -      8407      2.34      0.00  |__gnome-terminal-
 00:00:04     1000      8741         -      7.68      0.00  firefox
 00:00:04     1000         -      8741      7.68      0.00  |__firefox
-00:00:04     1000         -      8364      0.51      0.00  |__dconf worker
+00:00:04     1000     21342      8364      0.51      0.00  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365      0.45      0.03  |__evolution-addre
 
 00:00:02      UID      TGID       TID threads   fd-nr  Command
-00:00:04     1000         -      8364       5       5  |__dconf worker
+00:00:04     1000     21342      8364       5       5  (soffice.bin)__dconf worker
 00:00:04     1000         -      8365       5       5  |__evolution-addre
 
 00:00:02      UID      TGID       TID prio policy  Command
@@ -100,14 +100,14 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:06     1000         -      7900    0.83    0.23    0.00    0.00    1.06     0  |__gnome-shell
 00:00:06        0      8407         -    0.05    0.03    0.00    0.03    0.08     4  gnome-terminal-
 00:00:06        0         -      8407    0.05    0.03    0.00    0.03    0.08     4  |__gnome-terminal-
-00:00:06     1000         -      8785    0.00 479136209706741632.00    0.00    0.00 479136209706741632.00     5  |__disk_cache:0
+00:00:06     1000      8741      8785    0.00 479136209706741632.00    0.00    0.00 479136209706741632.00     5  (firefox)__disk_cache:0
 00:00:06     1000      9009         -   11.74    5.77    0.00    1.56   17.51     3  WebExtensions
 00:00:06     1000         -      9009    8.91    2.62    0.00    1.56   11.53     3  |__WebExtensions
 
 00:00:04      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:06     1000      7900         -    318.81      0.00 4451936  259076   3.18  gnome-shell
 00:00:06     1000         -      7900    318.81      0.00 4451936  259076   3.18  |__gnome-shell
-00:00:06     1000         -      8785 479136209706741376.00 479136209706741632.00 1432632   51352   0.63  |__disk_cache:0
+00:00:06     1000      8741      8785 479136209706741376.00 479136209706741632.00 1432632   51352   0.63  (firefox)__disk_cache:0
 00:00:06     1000         -      9109      0.00      0.00 2535720  335804   4.12  |__DOM Worker
 00:00:06     1000      9009         -    643.64      0.36 1744508  105628   1.30  WebExtensions
 00:00:06     1000         -      9009    497.95      0.26 1744508  105628   1.30  |__WebExtensions
@@ -119,23 +119,23 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:06     1000         -      9033     132      20  |__ImageIO
 
 00:00:04      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:06     1000         -      8785 467906454791736.25      0.05      0.00 18446744073709551611  |__disk_cache:0
+00:00:06     1000      8741      8785 467906454791736.25      0.05      0.00 18446744073709551611  (firefox)__disk_cache:0
 00:00:06     1000      9009         -     30.65      0.00      0.00      69  WebExtensions
 00:00:06     1000         -      9009     24.52      0.00      0.00      69  |__WebExtensions
-00:00:06     1000         -      8364      0.05      0.00      0.00       0  |__dconf worker
+00:00:06     1000     21342      8364      0.05      0.00      0.00       0  (soffice.bin)__dconf worker
 
 00:00:04      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:06     1000      7900         -     11.71      6.81  gnome-shell
 00:00:06     1000         -      7900     11.71      6.81  |__gnome-shell
 00:00:06        0      8407         -      1.22      0.00  gnome-terminal-
 00:00:06        0         -      8407      1.22      0.00  |__gnome-terminal-
-00:00:06     1000         -      8785 479136209706741632.00 479136209706741632.00  |__disk_cache:0
+00:00:06     1000      8741      8785 479136209706741632.00 479136209706741632.00  (firefox)__disk_cache:0
 00:00:06     1000      9009         -    629.38     11.90  WebExtensions
 00:00:06     1000         -      9009    629.38     11.90  |__WebExtensions
 00:00:06     1000         -      9033      0.03      0.00  |__ImageIO
 
 00:00:04      UID      TGID       TID threads   fd-nr  Command
-00:00:06     1000         -      8785       5       5  |__disk_cache:0
+00:00:06     1000      8741      8785       5       5  (firefox)__disk_cache:0
 00:00:06     1000         -      8789      66       5  |__Link Monitor
 00:00:06     1000         -      8835      66       5  |__ImgDecoder #1
 00:00:06     1000         -      9109      66       5  |__DOM Worker
@@ -144,7 +144,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)     01/01/70        _x86_64_        (8 CPU)
 00:00:06     1000         -      9033      32       5  |__ImageIO
 
 00:00:04      UID      TGID       TID prio policy  Command
-00:00:06     1000         -      8785    0   IDLE  |__disk_cache:0
+00:00:06     1000      8741      8785    0   IDLE  (firefox)__disk_cache:0
 
 00:00:06      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:08     1000      7900         -    3.31    0.71    0.00    0.09    4.02     5  gnome-shell
@@ -157,20 +157,20 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:06      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:08     1000      7900         -    736.85      0.00 4448816  259144   3.18  gnome-shell
 00:00:08     1000         -      7900    743.28      0.00 4450840  259144   3.18  |__gnome-shell
-00:00:08     1000         -      8789      0.00      0.00 2524288  330644   4.06  |__Link Monitor
+00:00:08     1000      8741      8789      0.00      0.00 2524288  330644   4.06  (firefox)__Link Monitor
 00:00:08     1000         -      8835      0.00      0.00 2524288  330644   4.06  |__ImgDecoder #1
 00:00:08     1000         -      9109      0.00      0.00 2524288  330644   4.06  |__DOM Worker
 00:00:08     1000      9009         -      5.09      0.00 1744508  106108   1.30  WebExtensions
 00:00:08     1000         -      9009      5.09      0.00 1744508  106108   1.30  |__WebExtensions
 00:00:08     1000         -      9033      0.00      0.00 1744508  106108   1.30  |__ImageIO
-00:00:08     1000         -     21344      0.40      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344      0.40      0.00 1790688  439484   5.40  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID StkSize  StkRef  Command
-00:00:08     1000         -     21344     132      36  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344     132      36  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:08     1000         -      8785      0.00      0.00      0.00       0  |__disk_cache:0
-00:00:08     1000         -      8364      0.00      0.00      0.00       0  |__dconf worker
+00:00:08     1000      8741      8785      0.00      0.00      0.00       0  (firefox)__disk_cache:0
+00:00:08     1000     21342      8364      0.00      0.00      0.00       0  (soffice.bin)__dconf worker
 
 00:00:06      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:08     1000      7900         -     43.77     17.87  gnome-shell
@@ -179,13 +179,13 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:08        0         -      8407      2.28      0.00  |__gnome-terminal-
 00:00:08     1000      9009         -      2.81      0.04  WebExtensions
 00:00:08     1000         -      9009      2.81      0.04  |__WebExtensions
-00:00:08     1000         -     21344      9.65      0.00  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344      9.65      0.00  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID threads   fd-nr  Command
-00:00:08     1000         -      8789      69       5  |__Link Monitor
+00:00:08     1000      8741      8789      69       5  (firefox)__Link Monitor
 00:00:08     1000         -      8835      69       5  |__ImgDecoder #1
 00:00:08     1000         -      9109      69       5  |__DOM Worker
-00:00:08     1000         -     21344       6       5  |__rtl_cache_wsupd
+00:00:08     1000     21342     21344       6       5  (soffice.bin)__rtl_cache_wsupd
 
 00:00:06      UID      TGID       TID prio policy  Command
 
@@ -194,22 +194,22 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:10        0         -      8407    0.00    0.00    0.00    0.00    0.00     2  |__gnome-terminal-
 
 00:00:08      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
-00:00:10     1000         -      8789      0.00      0.00 2524532  339528   4.17  |__Link Monitor
+00:00:10     1000      8741      8789      0.00      0.00 2524532  339528   4.17  (firefox)__Link Monitor
 00:00:10     1000         -      8835      0.00      0.00 2524532  339528   4.17  |__ImgDecoder #1
 00:00:10     1000         -      9109      0.00      0.00 2524532  339528   4.17  |__DOM Worker
 
 00:00:08      UID      TGID       TID StkSize  StkRef  Command
 
 00:00:08      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:10     1000         -      8785      0.00      0.00      0.00       0  |__disk_cache:0
+00:00:10     1000      8741      8785      0.00      0.00      0.00       0  (firefox)__disk_cache:0
 
 00:00:08      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:10        0      8407         -      0.00      0.00  gnome-terminal-
 00:00:10        0         -      8407      0.00      0.00  |__gnome-terminal-
-00:00:10     1000         -      8835      0.00      0.00  |__ImgDecoder #1
+00:00:10     1000      8741      8835      0.00      0.00  (firefox)__ImgDecoder #1
 
 00:00:08      UID      TGID       TID threads   fd-nr  Command
-00:00:10     1000         -      8789      70       5  |__Link Monitor
+00:00:10     1000      8741      8789      70       5  (firefox)__Link Monitor
 00:00:10     1000         -      8835      70       5  |__ImgDecoder #1
 00:00:10     1000         -      9109      70       5  |__DOM Worker
 
@@ -222,21 +222,21 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)   01/01/70        _x86_64_        (8 CPU)
 00:00:10      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 00:00:12        0      8407         -      0.03      0.00  723868   42156   0.52  gnome-terminal-
 00:00:12        0         -      8407      0.03      0.00  723868   42156   0.52  |__gnome-terminal-
-00:00:12     1000         -      8789      0.00      0.00 2534716  342460   4.20  |__Link Monitor
+00:00:12     1000      8741      8789      0.00      0.00 2534716  342460   4.20  (firefox)__Link Monitor
 00:00:12     1000         -      8835      0.00      0.00 2534716  342460   4.20  |__ImgDecoder #1
 00:00:12     1000         -      9109      0.00      0.00 2534716  342460   4.20  |__DOM Worker
 
 00:00:10      UID      TGID       TID StkSize  StkRef  Command
 
 00:00:10      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-00:00:12     1000         -      8785      0.00      0.00      0.00       0  |__disk_cache:0
+00:00:12     1000      8741      8785      0.00      0.00      0.00       0  (firefox)__disk_cache:0
 
 00:00:10      UID      TGID       TID   cswch/s nvcswch/s  Command
 00:00:12        0      8407         -      2.34      0.00  gnome-terminal-
 00:00:12        0         -      8407      2.31      0.00  |__gnome-terminal-
 
 00:00:10      UID      TGID       TID threads   fd-nr  Command
-00:00:12     1000         -      8789      71       5  |__Link Monitor
+00:00:12     1000      8741      8789      71       5  (firefox)__Link Monitor
 00:00:12     1000         -      8835      71       5  |__ImgDecoder #1
 00:00:12     1000         -      9109      71       5  |__DOM Worker
 
@@ -248,7 +248,7 @@ Average:        0         -      8407    0.77    0.06    0.00    0.03    0.83
 Average:     1000      8741         -    0.13    0.03    0.00    0.03    0.16     -  firefox
 Average:     1000         -      8741    0.10    0.00    0.00    0.03    0.10     -  |__firefox
 Average:     1000         -      8785    0.00 591810846124785152.00    0.00    0.00 591810846124785152.00     -  |__disk_cache:0
-Average:     1000         -      8365    0.06    0.00    0.00    0.00    0.06     -  |__evolution-addre
+Average:     1000     21342      8365    0.06    0.00    0.00    0.00    0.06     -  (soffice.bin)__evolution-addre
 
 Average:      UID      TGID       TID  minflt/s  majflt/s     VSZ     RSS   %MEM  Command
 Average:        0      8407         -      0.32      0.00  723868   42156   0.52  gnome-terminal-
@@ -259,14 +259,16 @@ Average:     1000         -      8785 591810846124784896.00 591810846124785152.0
 Average:     1000         -      8789      0.00      0.00 2531783  336674   4.13  |__Link Monitor
 Average:     1000         -      8835      0.10      0.00 2531783  336674   4.13  |__ImgDecoder #1
 Average:     1000         -      9109      0.00      0.00 2531785  336674   4.13  |__DOM Worker
-Average:     1000         -      8365      8.92      0.00 1264684   46212   0.57  |__evolution-addre
+Average:     1000     21342      8365      8.92      0.00 1264684   46212   0.57  (soffice.bin)__evolution-addre
+Average:     1000         -     21344      0.29      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID StkSize  StkRef  Command
-Average:     1000         -      8365     132      36  |__evolution-addre
+Average:     1000     21342      8365     132      36  (soffice.bin)__evolution-addre
+Average:     1000         -     21344     132      36  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
-Average:     1000         -      8785 577940279418731.00      0.06      0.00 3074457345618258432  |__disk_cache:0
-Average:     1000         -      8365      0.27      0.14      0.00       0  |__evolution-addre
+Average:     1000      8741      8785 577940279418731.00      0.06      0.00 3074457345618258432  (firefox)__disk_cache:0
+Average:     1000     21342      8365      0.27      0.14      0.00       0  (soffice.bin)__evolution-addre
 
 Average:      UID      TGID       TID   cswch/s nvcswch/s  Command
 Average:        0      8407         -     15.01      0.06  gnome-terminal-
@@ -275,14 +277,16 @@ Average:     1000      8741         -      9.30      0.00  firefox
 Average:     1000         -      8741      9.30      0.00  |__firefox
 Average:     1000         -      8785 591810846124785152.00 591810846124785152.00  |__disk_cache:0
 Average:     1000         -      8835      0.06      0.00  |__ImgDecoder #1
-Average:     1000         -      8365      0.45      0.03  |__evolution-addre
+Average:     1000     21342      8365      0.45      0.03  (soffice.bin)__evolution-addre
+Average:     1000         -     21344      6.93      0.00  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID threads   fd-nr  Command
-Average:     1000         -      8785      26       5  |__disk_cache:0
+Average:     1000      8741      8785      26       5  (firefox)__disk_cache:0
 Average:     1000         -      8789      68       5  |__Link Monitor
 Average:     1000         -      8835      68       5  |__ImgDecoder #1
 Average:     1000         -      9109      68       5  |__DOM Worker
-Average:     1000         -      8365       5       5  |__evolution-addre
+Average:     1000     21342      8365       5       5  (soffice.bin)__evolution-addre
+Average:     1000         -     21344       6       5  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID prio policy  Command
-Average:     1000         -      8785    0   IDLE  |__disk_cache:0
+Average:     1000      8741      8785    0   IDLE  (firefox)__disk_cache:0

diff --git a/tests/expected1.pidstat-At-TTASK-ALL b/tests/expected1.pidstat-At-TTASK-ALL
index 949bc27e110a7c3747c8ef7b5927c063eeddacbe..b15296a151544ef5c43f9b1f8d6cac44628fb376 100644 (file)
--- a/tests/expected1.pidstat-At-TTASK-ALL
+++ b/tests/expected1.pidstat-At-TTASK-ALL
@@ -761,7 +761,7 @@ Average:     1000         -      9109      0.00      0.00 2531785  336674   4.13
 Average:     1000     21342         -      0.00      0.00 1790688  439484   5.40  soffice.bin
 Average:     1000         -      8365      8.92      0.00 1264684   46212   0.57  |__evolution-addre
 Average:     1000         -     21342      0.00      0.00 1790688  439484   5.40  |__soffice.bin
-Average:     1000         -     21344      0.00      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
+Average:     1000         -     21344      0.29      0.00 1790688  439484   5.40  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID StkSize  StkRef  Command
 Average:        0      8407         -     132     120  gnome-terminal-
@@ -803,7 +803,7 @@ Average:     1000         -      9109      0.00      0.00  |__DOM Worker
 Average:     1000     21342         -      0.00      0.00  soffice.bin
 Average:     1000         -      8365      0.45      0.03  |__evolution-addre
 Average:     1000         -     21342      0.00      0.00  |__soffice.bin
-Average:     1000         -     21344      0.00      0.00  |__rtl_cache_wsupd
+Average:     1000         -     21344      6.93      0.00  |__rtl_cache_wsupd
 
 Average:      UID      TGID       TID threads   fd-nr  Command
 Average:        0      8407         -       4       5  gnome-terminal-

diff --git a/tests/expected1.pidstat-d-TTASK b/tests/expected1.pidstat-d-TTASK
index ea6be72be5a58a13a07660340b7636c450f51700..6cfef649b90abd6ad0fcb9e3f5b55b0ed88012c7 100644 (file)
--- a/tests/expected1.pidstat-d-TTASK
+++ b/tests/expected1.pidstat-d-TTASK
@@ -10,3 +10,4 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)       01/01/70        _x86_64_        (8 CPU)
 
 Average:      UID       PID   kB_rd/s   kB_wr/s kB_ccwr/s iodelay  Command
 Average:     1000      7900    127.20      0.87      0.00      84  gnome-shell
+Average:     1000      9009     11.69      0.00      0.00      69  WebExtensions

diff --git a/tests/expected1.pidstat-p b/tests/expected1.pidstat-p
index 28b3ea9dd631ce38f344978f02b1bb3be47889ae..dbcaecf9cf0b23a3fb043bbec24bd47de46bab2f 100644 (file)
--- a/tests/expected1.pidstat-p
+++ b/tests/expected1.pidstat-p
@@ -64,7 +64,7 @@ Average:      UID       PID    %usr %system  %guest   %wait    %CPU   CPU  Comma
 Average:     1000      7900  111.56   16.68    0.00    2.64  128.24     -  gnome-shell
 Average:        0      8407    0.19    0.02    0.00    0.01    0.21     -  gnome-terminal-
 Average:     1000      8741    0.04    0.01    0.00    0.01    0.05     -  firefox
-Average:     1000      9009    0.01    0.00    0.00    0.00    0.01     -  WebExtensions
+Average:     1000      9009    4.48    2.20    0.00    0.59    6.68     -  WebExtensions
 Average:     1000     21342    0.00    0.00    0.00    0.00    0.00     -  soffice.bin
 
 Average:      UID       PID StkSize  StkRef  Command
@@ -78,5 +78,5 @@ Average:      UID       PID   cswch/s nvcswch/s  Command
 Average:     1000      7900   1769.08    220.92  gnome-shell
 Average:        0      8407      2.74      0.02  gnome-terminal-
 Average:     1000      8741      2.87      0.00  firefox
-Average:     1000      9009      0.63      0.00  WebExtensions
+Average:     1000      9009    240.12      4.54  WebExtensions
 Average:     1000     21342      0.00      0.00  soffice.bin

diff --git a/tests/expected2.pidstat-G b/tests/expected2.pidstat-G
index 5064d6d401520e5bdb342345fb740fde09a5b7e2..37d5962eaeaca99730f52eb6894a6cd50027322a 100644 (file)
--- a/tests/expected2.pidstat-G
+++ b/tests/expected2.pidstat-G
@@ -5,7 +5,6 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)         01/01/70        _x86_64_        (8 CPU)
 00:00:02      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:04     1000      8741         -    0.13    0.03    0.00    0.03    0.16     5  firefox
 00:00:04     1000         -      8741    0.06    0.00    0.00    0.03    0.06     5  |__firefox
-00:00:04     1000         -      8365    0.06    0.00    0.00    0.00    0.06     7  |__evolution-addre
 
 00:00:04      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 
@@ -19,4 +18,3 @@ Average:      UID      TGID       TID    %usr %system  %guest   %wait    %CPU
 Average:     1000      8741         -    0.13    0.03    0.00    0.03    0.16     -  firefox
 Average:     1000         -      8741    0.10    0.00    0.00    0.03    0.10     -  |__firefox
 Average:     1000         -      8785    0.00 591810846124785152.00    0.00    0.00 591810846124785152.00     -  |__disk_cache:0
-Average:     1000         -      8365    0.06    0.00    0.00    0.00    0.06     -  |__evolution-addre

diff --git a/tests/expected3.pidstat-C b/tests/expected3.pidstat-C
index da2d525f2d83906912e0c4a1f264cb4a83e3c1b1..88cd6b29b7429ddf2ba6a1e7c698f6e9ba7d6923 100644 (file)
--- a/tests/expected3.pidstat-C
+++ b/tests/expected3.pidstat-C
@@ -1,7 +1,7 @@
 Linux 1.2.3-TEST (SYSSTAT.TEST)        01/01/70        _x86_64_        (8 CPU)
 
 00:00:00      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
-00:00:02     1000         -      9009    0.03    0.00    0.00    0.00    0.03     3  |__WebExtensions
+00:00:02     1000      9009      9009    0.03    0.00    0.00    0.00    0.03     3  (WebExtensions)__WebExtensions
 
 00:00:02      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 

diff --git a/tests/expected4.pidstat-C b/tests/expected4.pidstat-C
index 204d8d2695708cef38045011dbad548e69aa2cb8..1ba19c764ddb5805d68709ab96063a31dd4009c8 100644 (file)
--- a/tests/expected4.pidstat-C
+++ b/tests/expected4.pidstat-C
@@ -3,7 +3,7 @@ Linux 1.2.3-TEST (SYSSTAT.TEST)         01/01/70        _x86_64_        (8 CPU)
 00:00:00      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:02     1000      7900         -  359.42   53.55    0.00    8.47  412.96     2  gnome-shell
 00:00:02     1000         -      7900  349.70   51.43    0.00    8.47  401.12     2  |__gnome-shell
-00:00:02     1000         -      8741    0.03    0.00    0.00    0.00    0.03     0  |__firefox
+00:00:02     1000      8741      8741    0.03    0.00    0.00    0.00    0.03     0  (firefox)__firefox
 
 00:00:02      UID      TGID       TID    %usr %system  %guest   %wait    %CPU   CPU  Command
 00:00:04     1000      7900         -    0.67    0.16    0.00    0.06    0.83     7  gnome-shell