aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-06-20 11:17:22 +0200
committerLukas Larsson <[email protected]>2018-06-20 11:17:22 +0200
commitbd5541b57fcada9ad213deb13648a070d64d0edb (patch)
tree3e6137beff4caf411d0f042ae9a97c1fdd0f599e /erts
parent759cdfb5dfc45a91bced732fe3d33f05604e1467 (diff)
parenta01fffa207cecca87861f300e487b7d2cf950f04 (diff)
downloadotp-bd5541b57fcada9ad213deb13648a070d64d0edb.tar.gz
otp-bd5541b57fcada9ad213deb13648a070d64d0edb.tar.bz2
otp-bd5541b57fcada9ad213deb13648a070d64d0edb.zip
Merge branch 'lukas/erts/etp-aux-work-fixes' into maint
* lukas/erts/etp-aux-work-fixes: erts: Update etp-commands with correct aux_flags
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_process.h2
-rw-r--r--erts/etc/unix/etp-commands.in26
2 files changed, 20 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index a60e117bab..8d20ccdf90 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -293,7 +293,7 @@ typedef enum {
* highest index...
*
* Remember to update description in erts_pre_init_process()
- * when adding new flags...
+ * and etp-commands when adding new flags...
*/
typedef enum {
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 5b89621733..b12a205ba7 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -2734,25 +2734,37 @@ define etp-aux-work-flags
printf " fix-alloc-lower-lim"
end
if ($arg0 & 0x10)
- printf " async-ready"
+ printf " later-op"
end
if ($arg0 & 0x20)
- printf " async-ready-clean"
+ printf " canceled-timers"
end
if ($arg0 & 0x40)
- printf " misc-work-thr-prgr"
+ printf " canceled-timers-thr-prgr"
end
if ($arg0 & 0x80)
- printf " misc-work"
+ printf " async-ready"
end
if ($arg0 & 0x100)
- printf " check-children"
+ printf " async-ready-clean"
end
if ($arg0 & 0x200)
- printf " set-tmo"
+ printf " misc-thr-prgr"
end
if ($arg0 & 0x400)
- printf " mseg-cached-check"
+ printf " misc"
+ end
+ if ($arg0 & 0x800)
+ printf " set-tmo"
+ end
+ if ($arg0 & 0x1000)
+ printf " mseg-cache-check"
+ end
+ if ($arg0 & 0x2000)
+ printf " yield"
+ end
+ if ($arg0 & 0x1000)
+ printf " reap-ports"
end
if ($arg0 & ~0x7ff)
printf " GARBAGE"