aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/unix
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-06-22 19:27:50 +0200
committerSverker Eriksson <[email protected]>2016-06-22 19:27:50 +0200
commita9ad9336a33ffbe0979a8e8e34bd69d0d87ede84 (patch)
tree7ba303f765e95d3a09100b1b3e829a518699b4d7 /erts/etc/unix
parent4fb4d6c57a987f58915f21af5a6321c5228b45dc (diff)
downloadotp-a9ad9336a33ffbe0979a8e8e34bd69d0d87ede84.tar.gz
otp-a9ad9336a33ffbe0979a8e8e34bd69d0d87ede84.tar.bz2
otp-a9ad9336a33ffbe0979a8e8e34bd69d0d87ede84.zip
erts: Fix etp-carrier-blocks for non smp
Diffstat (limited to 'erts/etc/unix')
-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