aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-07-07 11:34:13 +0200
committerSverker Eriksson <[email protected]>2016-07-07 11:34:13 +0200
commit4cf0d172b61b06f8b5c2765da7e134c2b912c492 (patch)
tree9c04574bfab3c2a5a27f70a42a6c6323984a7522 /erts/etc
parent269dae49056d29c65add089deffebf27b86980c3 (diff)
parent9026aeebb86396e850a8f6347d1a81f9e2db5918 (diff)
downloadotp-4cf0d172b61b06f8b5c2765da7e134c2b912c492.tar.gz
otp-4cf0d172b61b06f8b5c2765da7e134c2b912c492.tar.bz2
otp-4cf0d172b61b06f8b5c2765da7e134c2b912c492.zip
Merge branch 'maint'
Diffstat (limited to 'erts/etc')
-rw-r--r--erts/etc/unix/etp-commands.in17
1 files changed, 16 insertions, 1 deletions
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 15fb718c47..e2bf302cca 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -3581,9 +3581,24 @@ document etp-block
%---------------------------------------------------------------------------
end
+define etp-smp-atomic
+ if (etp_smp_compiled)
+ set $arg1 = (($arg0).counter)
+ else
+ set $arg1 = ($arg0)
+ end
+end
+
+document etp-smp-atomic
+%---------------------------------------------------------------------------
+% Read an erts_smp_atomic_t value from $arg0 into $arg1
+%---------------------------------------------------------------------------
+end
+
define etp-carrier-blocks
set $etp_crr = (Carrier_t*) $arg0
- set $etp_alc = (Allctr_t*)($etp_crr->allctr.counter & ~7)
+ etp-smp-atomic $etp_crr->allctr $etp_alc
+ set $etp_alc = (Allctr_t*)($etp_alc & ~7)
set $etp_crr_end = ((char*)$etp_crr + ($etp_crr->chdr & ~7) - (sizeof(void*) & ~8))
set $etp_blk = (Block_t*) ((char*)$etp_crr + $etp_alc->mbc_header_size)
set $etp_prev_blk = 0