aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-03-24 13:28:53 +0100
committerHenrik Nord <[email protected]>2016-03-24 13:30:23 +0100
commitdfa3b2414384f1ee0cdc062a23df5f1094a7069e (patch)
treea020909df98d176c313eb86c9db07d98727c0ee1 /erts/emulator
parentab418313123e98d5de15e2e71ac169afdad8d3f8 (diff)
downloadotp-dfa3b2414384f1ee0cdc062a23df5f1094a7069e.tar.gz
otp-dfa3b2414384f1ee0cdc062a23df5f1094a7069e.tar.bz2
otp-dfa3b2414384f1ee0cdc062a23df5f1094a7069e.zip
erts: std_alloc is not thread safe on non-smp
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_alloc.types5
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 14067283bd..7a5f821ed8 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -258,7 +258,6 @@ type PRTSD STANDARD SYSTEM port_specific_data
type CPUDATA LONG_LIVED SYSTEM cpu_data
type TMP_CPU_IDS SHORT_LIVED SYSTEM tmp_cpu_ids
type EXT_TERM_DATA SHORT_LIVED PROCESSES external_term_data
-type ZLIB STANDARD SYSTEM zlib
type CPU_GRPS_MAP LONG_LIVED SYSTEM cpu_groups_map
type AUX_WORK_TMO LONG_LIVED SYSTEM aux_work_timeouts
type MISC_AUX_WORK_Q LONG_LIVED SYSTEM misc_aux_work_q
@@ -288,8 +287,10 @@ type THR_Q_LL LONG_LIVED SYSTEM long_lived_thr_queue
+if smp
type ASYNC SHORT_LIVED SYSTEM async
+type ZLIB STANDARD SYSTEM zlib
+else
-# sl_alloc is not thread safe in non smp build; therefore, we use driver_alloc
+# sl/std_alloc is not thread safe in non smp build; therefore, we use driver_alloc
+type ZLIB DRIVER SYSTEM zlib
type ASYNC DRIVER SYSTEM async
+endif