aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-09-25 20:23:06 +0200
committerSverker Eriksson <[email protected]>2017-11-15 20:13:03 +0100
commit23ba06691aa64d7f05781bc9b2ea448c3710a812 (patch)
tree304123544a1b97301d7432d48d33ce6c0b8ef994
parentbc1bb9f2a9e33ae4d1e91632852ecdddfa58a4d0 (diff)
downloadotp-23ba06691aa64d7f05781bc9b2ea448c3710a812.tar.gz
otp-23ba06691aa64d7f05781bc9b2ea448c3710a812.tar.bz2
otp-23ba06691aa64d7f05781bc9b2ea448c3710a812.zip
Remove unused ERTS_DSP_RWLOCK
-rw-r--r--erts/emulator/beam/dist.h19
1 files changed, 5 insertions, 14 deletions
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index 2ead588ee9..b9b39de3b6 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -96,8 +96,7 @@ extern Export* dmonitor_p_trap;
typedef enum {
ERTS_DSP_NO_LOCK,
- ERTS_DSP_RLOCK,
- ERTS_DSP_RWLOCK
+ ERTS_DSP_RLOCK
} ErtsDSigPrepLock;
@@ -182,10 +181,7 @@ erts_dsig_prepare(ErtsDSigData *dsdp,
#endif
retry:
- if (dspl == ERTS_DSP_RWLOCK)
- erts_de_rwlock(dep);
- else
- erts_de_rlock(dep);
+ erts_de_rlock(dep);
if (ERTS_DE_IS_CONNECTED(dep)) {
res = ERTS_DSIG_PREP_CONNECTED;
@@ -200,10 +196,8 @@ retry:
}
else if (connect) {
ASSERT(dep->status == 0);
- if (dspl != ERTS_DSP_RWLOCK) {
- erts_de_runlock(dep);
- erts_de_rwlock(dep);
- }
+ erts_de_runlock(dep);
+ erts_de_rwlock(dep);
if (dep->status == 0) {
Process* net_kernel;
ErtsProcLocks nk_locks = ERTS_PROC_LOCK_MSGQ;
@@ -265,10 +259,7 @@ retry:
return res;
fail:
- if (dspl == ERTS_DSP_RWLOCK)
- erts_de_rwunlock(dep);
- else
- erts_de_runlock(dep);
+ erts_de_runlock(dep);
if (deref_dep)
erts_deref_dist_entry(dep);
return res;