File 1021-erts-Fix-etp-carrier-blocks-for-non-smp.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1021-erts-Fix-etp-carrier-blocks-for-non-smp.patch of Package erlang (Revision d4970e4b1284085ce4cdb3ac267e9b09)

Currently displaying revision d4970e4b1284085ce4cdb3ac267e9b09 , Show latest

From a9ad9336a33ffbe0979a8e8e34bd69d0d87ede84 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 22 Jun 2016 19:27:50 +0200
Subject: [PATCH 3/3] erts: Fix etp-carrier-blocks for non smp

---
 erts/etc/unix/etp-commands.in | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 15fb718..e2bf302 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
-- 
2.1.4

Places

File 1021-erts-Fix-etp-carrier-blocks-for-non-smp.patch of Package erlang (Revision d4970e4b1284085ce4cdb3ac267e9b09)

Places