From ea71ae9a65b14e20c982c818e3c10e50af9ae677 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 30 Jan 2022 08:03:11 -0500 Subject: fix: use a re-entrant lock to avoid self-deadlocking #1310 --- coverage/sqldata.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'coverage/sqldata.py') diff --git a/coverage/sqldata.py b/coverage/sqldata.py index 5e27cd85..2bec3c96 100644 --- a/coverage/sqldata.py +++ b/coverage/sqldata.py @@ -215,7 +215,7 @@ class CoverageData(SimpleReprMixin): self._dbs = {} self._pid = os.getpid() # Synchronize the operations used during collection. - self._lock = threading.Lock() + self._lock = threading.RLock() # Are we in sync with the data file? self._have_used = False @@ -231,7 +231,11 @@ class CoverageData(SimpleReprMixin): """A decorator for methods that should hold self._lock.""" @functools.wraps(method) def _wrapped(self, *args, **kwargs): + if self._debug.should("lock"): + self._debug.write(f"Locking {self._lock!r} for {method.__name__}") with self._lock: + if self._debug.should("lock"): + self._debug.write(f"Locked {self._lock!r} for {method.__name__}") # pylint: disable=not-callable return method(self, *args, **kwargs) return _wrapped -- cgit v1.2.1