AaronFiore/electrum
1
0
Fork 0
Code Activity

util.CallbackManager: follow-up prev: fix deadlock

Browse Source
This commit is contained in:
SomberNight
2026-01-21 17:51:03 +00:00
parent 87540dbe3e
commit cc4611f43d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/util.py
View File

@@ -1954,7 +1954,7 @@ class CallbackManager(Logger):
def __init__(self): def __init__(self):
Logger.__init__(self) Logger.__init__(self)
self.callback_lock = threading.Lock() self.callback_lock = threading.RLock()
self._wcallbacks = defaultdict(set) # type: Dict[str, Set[weakref.ref[Callable]]] # note: needs self.callback_lock self._wcallbacks = defaultdict(set) # type: Dict[str, Set[weakref.ref[Callable]]] # note: needs self.callback_lock
@staticmethod @staticmethod
@@ -1976,6 +1976,7 @@ class CallbackManager(Logger):
def unregister_callback(self, cb: Callable) -> None: def unregister_callback(self, cb: Callable) -> None:
wcb = self._wcb_from_any_callback(cb) wcb = self._wcb_from_any_callback(cb)
with self.callback_lock: with self.callback_lock:
# note: ^ callback_lock needs to be re-entrant, as we can now trigger __del__, which also takes the lock
for callbacks in self._wcallbacks.values(): for callbacks in self._wcallbacks.values():
if wcb in callbacks: if wcb in callbacks:
callbacks.remove(wcb) callbacks.remove(wcb)