aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-05-05 14:47:33 +0200
committerLukas Larsson <[email protected]>2014-05-05 14:47:33 +0200
commit68f597b23c0c771a306149f9c7eaf566cbaa665b (patch)
tree77caf85ca6b0484b231275811533f32435a9651f /erts/emulator
parentabdd3f82100c515508e2c431f8f34dbbc9400d29 (diff)
parent49d8e0f92e0b496c9be4c13edecc498b31380cc9 (diff)
downloadotp-68f597b23c0c771a306149f9c7eaf566cbaa665b.tar.gz
otp-68f597b23c0c771a306149f9c7eaf566cbaa665b.tar.bz2
otp-68f597b23c0c771a306149f9c7eaf566cbaa665b.zip
Merge branch 'lukas/erts/etp-lc-macros/OTP-11904' into maint
* lukas/erts/etp-lc-macros/OTP-11904: erts: Add etp-lc-dump and etp-ppc-stacktrace macro
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_lock_check.c4
-rw-r--r--erts/emulator/beam/erl_process.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index 7e3a90779d..c13eb87012 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -270,9 +270,9 @@ union erts_lc_free_block_t_ {
static ethr_tsd_key locks_key;
-static erts_lc_locked_locks_t *erts_locked_locks;
+static erts_lc_locked_locks_t *erts_locked_locks = NULL;
-static erts_lc_free_block_t *free_blocks;
+static erts_lc_free_block_t *free_blocks = NULL;
#ifdef ERTS_LC_STATIC_ALLOC
#define ERTS_LC_FB_CHUNK_SIZE 10000
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index b4b97d7df1..3130b207e1 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -2672,6 +2672,13 @@ aux_thread(void *unused)
ErtsThrPrgrCallbacks callbacks;
int thr_prgr_active = 1;
+#ifdef ERTS_ENABLE_LOCK_CHECK
+ {
+ char buf[] = "aux_thread";
+ erts_lc_set_thread_name(buf);
+ }
+#endif
+
ssi->event = erts_tse_fetch();
callbacks.arg = (void *) ssi;