diff options
| author | Rickard Green <[email protected]> | 2010-09-10 09:55:48 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-09-10 09:55:48 +0200 |
| commit | 358eaf9d14a0102eaca5bb482d03d4fc37639724 (patch) | |
| tree | 472b11b92a6c75f72cd6d626558444363097da1d /erts/emulator/beam/erl_node_tables.c | |
| parent | a4c1adcdbb8bcf6be85b22232ea3093cf2299b83 (diff) | |
| parent | 775365a86f69bd4a9f8db44b7017662854415540 (diff) | |
| download | otp-358eaf9d14a0102eaca5bb482d03d4fc37639724.tar.gz otp-358eaf9d14a0102eaca5bb482d03d4fc37639724.tar.bz2 otp-358eaf9d14a0102eaca5bb482d03d4fc37639724.zip | |
Merge branch 'rickard/rwmtx-spin/OTP-8819' into dev
* rickard/rwmtx-spin/OTP-8819:
Fix deadlock in reader optimized rwlock implementation
Remove unused variables
Increase spincount with many schedulers
Re-enable spin wait on ethreads rwlocks
Diffstat (limited to 'erts/emulator/beam/erl_node_tables.c')
| -rw-r--r-- | erts/emulator/beam/erl_node_tables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c index e430b4ad77..d0b08bf72e 100644 --- a/erts/emulator/beam/erl_node_tables.c +++ b/erts/emulator/beam/erl_node_tables.c @@ -80,7 +80,7 @@ dist_table_alloc(void *dep_tmpl) Eterm chnl_nr; Eterm sysname; DistEntry *dep; - erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_THR_OPTS_DEFAULT_INITER; + erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER; rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ; if(((DistEntry *) dep_tmpl) == erts_this_dist_entry) @@ -710,7 +710,7 @@ erts_set_this_node(Eterm sysname, Uint creation) void erts_init_node_tables(void) { - erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_THR_OPTS_DEFAULT_INITER; + erts_smp_rwmtx_opt_t rwmtx_opt = ERTS_SMP_RWMTX_OPT_DEFAULT_INITER; HashFunctions f; rwmtx_opt.type = ERTS_SMP_RWMTX_TYPE_FREQUENT_READ; |