1570146486

Build Type

push

github

Committed by Unrud

Commit Message

Instant notification of all waiting readers

Run Details

1439 of 1817 branches covered (79.2%)

Branch coverage included in aggregate %.

2 of 2 new or added lines in 1 file covered. (100.0%)

5 existing lines in 2 files now uncovered.

3311 of 3871 relevant lines covered (85.53%)

12.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.42

/radicale/storage/multifilesystem_nolock.py

# This file is part of Radicale - CalDAV and CardDAV server
# Copyright © 2021 Unrud <unrud@outlook.com>
#
# This library is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Radicale.  If not, see <http://www.gnu.org/licenses/>.

"""
The multifilesystem backend without file-based locking.
"""

import threading
from collections import deque
from typing import Deque, Dict, Hashable, Iterator

from radicale import config, pathutils, types
from radicale.storage import multifilesystem


class RwLock(pathutils.RwLock):

    _cond: threading.Condition

    def __init__(self) -> None:
        super().__init__("")
        self._cond = threading.Condition(self._lock)

    @types.contextmanager
    def acquire(self, mode: str, user: str = "") -> Iterator[None]:
        if mode not in "rw":
            raise ValueError("Invalid mode: %r" % mode)
        with self._cond:
            self._cond.wait_for(lambda: not self._writer and (
                                    mode == "r" or self._readers == 0))
            if mode == "r":
                self._readers += 1
            else:
                self._writer = True
        try:
            yield
        finally:
            with self._cond:
                if mode == "r":
                    self._readers -= 1
                self._writer = False
                if self._readers == 0:
                    self._cond.notify_all()


class LockDict:

    _lock: threading.Lock
    _dict: Dict[Hashable, Deque[threading.Lock]]

    def __init__(self) -> None:
        self._lock = threading.Lock()
        self._dict = {}

    @types.contextmanager
    def acquire(self, key: Hashable) -> Iterator[None]:
        with self._lock:
            waiters = self._dict.get(key)
            if waiters is None:
                self._dict[key] = waiters = deque()
            wait = bool(waiters)
            waiter = threading.Lock()
            waiter.acquire()
            waiters.append(waiter)
        if wait:
            waiter.acquire()
        try:
            yield
        finally:
            with self._lock:
                del waiters[0]
                if waiters:
                    waiters[0].release()
                else:
                    del self._dict[key]


class Collection(multifilesystem.Collection):

    _storage: "Storage"

    @types.contextmanager
    def _acquire_cache_lock(self, ns: str = "") -> Iterator[None]:
        if self._storage._lock.locked == "w":
            yield
            return
        with self._storage._cache_lock.acquire((self.path, ns)):
            yield


class Storage(multifilesystem.Storage):

    _collection_class = Collection

    _cache_lock: LockDict

    def __init__(self, configuration: config.Configuration) -> None:
        super().__init__(configuration)
        self._lock = RwLock()
        self._cache_lock = LockDict()

1	# This file is part of Radicale - CalDAV and CardDAV server
2	# Copyright © 2021 Unrud <unrud@outlook.com>
3	#
4	# This library is free software: you can redistribute it and/or modify
5	# it under the terms of the GNU General Public License as published by
6	# the Free Software Foundation, either version 3 of the License, or
7	# (at your option) any later version.
8	#
9	# This library is distributed in the hope that it will be useful,
10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	# GNU General Public License for more details.
13	#
14	# You should have received a copy of the GNU General Public License
15	# along with Radicale. If not, see <http://www.gnu.org/licenses/>.
16
17	"""	15✔
18	The multifilesystem backend without file-based locking.
19	"""
20
21	import threading	15✔
22	from collections import deque	15✔
23	from typing import Deque, Dict, Hashable, Iterator	15✔
24
25	from radicale import config, pathutils, types	15✔
26	from radicale.storage import multifilesystem	15✔
27
28
29	class RwLock(pathutils.RwLock):	15✔
30
31	_cond: threading.Condition	15✔
32
33	def __init__(self) -> None:	15✔
34	super().__init__("")	15✔
35	self._cond = threading.Condition(self._lock)	15✔
36
37	@types.contextmanager	15✔
38	def acquire(self, mode: str, user: str = "") -> Iterator[None]:	15✔
39	if mode not in "rw":	15!
40	raise ValueError("Invalid mode: %r" % mode)	×
41	with self._cond:	15✔
42	self._cond.wait_for(lambda: not self._writer and (	15✔
43	mode == "r" or self._readers == 0))
44	if mode == "r":	15✔
45	self._readers += 1	15✔
46	else:
47	self._writer = True	15✔
48	try:	15✔
49	yield	15✔
50	finally:
51	with self._cond:	15✔
52	if mode == "r":	15✔
53	self._readers -= 1	15✔
54	self._writer = False	15✔
55	if self._readers == 0:	15!
56	self._cond.notify_all()	15✔
57
58
59	class LockDict:	15✔
60
61	_lock: threading.Lock	15✔
62	_dict: Dict[Hashable, Deque[threading.Lock]]	15✔
63
64	def __init__(self) -> None:	15✔
65	self._lock = threading.Lock()	15✔
66	self._dict = {}	15✔
67
68	@types.contextmanager	15✔
69	def acquire(self, key: Hashable) -> Iterator[None]:	15✔
70	with self._lock:	15✔
71	waiters = self._dict.get(key)	15✔
72	if waiters is None:	15!
73	self._dict[key] = waiters = deque()	15✔
74	wait = bool(waiters)	15✔
75	waiter = threading.Lock()	15✔
76	waiter.acquire()	15✔
77	waiters.append(waiter)	15✔
78	if wait:	15!
UNCOV 79	waiter.acquire()	×
80	try:	15✔
81	yield	15✔
82	finally:
83	with self._lock:	15✔
84	del waiters[0]	15✔
85	if waiters:	15!
86	waiters[0].release()	×
87	else:
88	del self._dict[key]	15✔
89
90
91	class Collection(multifilesystem.Collection):	15✔
92
93	_storage: "Storage"	15✔
94
95	@types.contextmanager	15✔
96	def _acquire_cache_lock(self, ns: str = "") -> Iterator[None]:	15✔
97	if self._storage._lock.locked == "w":	15!
UNCOV 98	yield	×
UNCOV 99	return	×
100	with self._storage._cache_lock.acquire((self.path, ns)):	15✔
101	yield	15✔
102
103
104	class Storage(multifilesystem.Storage):	15✔
105
106	_collection_class = Collection	15✔
107
108	_cache_lock: LockDict	15✔
109
110	def __init__(self, configuration: config.Configuration) -> None:	15✔
111	super().__init__(configuration)	15✔
112	self._lock = RwLock()	15✔
113	self._cache_lock = LockDict()	15✔

Kozea / Radicale / 1570146486

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous