AaronFiore/electrum
1
0
Fork 0
Code Activity

lnhtlc: fix deadlock

Browse Source
This commit is contained in:
SomberNight
2021-03-03 22:05:09 +01:00
parent adbfb2dcc8
commit f84f13529a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/lnhtlc.py
View File

@@ -41,7 +41,13 @@ class HTLCManager:
if not log[sub]['fee_updates']: if not log[sub]['fee_updates']:
log[sub]['fee_updates'][0] = FeeUpdate(rate=initial_feerate, ctn_local=0, ctn_remote=0) log[sub]['fee_updates'][0] = FeeUpdate(rate=initial_feerate, ctn_local=0, ctn_remote=0)
self.log = log self.log = log
self.lock = threading.RLock()
# We need a lock as many methods of HTLCManager are accessed by both the asyncio thread and the GUI.
# lnchannel sometimes calls us with Channel.db_lock (== log.lock) already taken,
# and we ourselves often take log.lock (via StoredDict.__getitem__).
# Hence, to avoid deadlocks, we reuse this same lock.
self.lock = log.lock
self._init_maybe_active_htlc_ids() self._init_maybe_active_htlc_ids()
def with_lock(func): def with_lock(func):