bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
2353.3.8
by John Arbash Meinel
Fix Copyright in lock.py |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
577
by Martin Pool
- merge portable lock module from John |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
577
by Martin Pool
- merge portable lock module from John |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
577
by Martin Pool
- merge portable lock module from John |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
||
|
1553.5.39
by Martin Pool
More lock docs |
18 |
"""Locking using OS file locks or file existence.
|
|
577
by Martin Pool
- merge portable lock module from John |
19 |
|
|
1553.5.46
by Martin Pool
doc |
20 |
Note: This method of locking is generally deprecated in favour of LockDir, but
|
21 |
is used to lock local WorkingTrees, and by some old formats. It's accessed
|
|
22 |
through Transport.lock_read(), etc.
|
|
|
577
by Martin Pool
- merge portable lock module from John |
23 |
|
24 |
This module causes two methods, lock() and unlock() to be defined in
|
|
25 |
any way that works on the current platform.
|
|
26 |
||
27 |
It is not specified whether these locks are reentrant (i.e. can be
|
|
28 |
taken repeatedly by a single process) or whether they exclude
|
|
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
29 |
different threads in a single process. That reentrancy is provided by
|
|
1553.5.39
by Martin Pool
More lock docs |
30 |
LockableFiles.
|
|
615
by Martin Pool
Major rework of locking code: |
31 |
|
32 |
This defines two classes: ReadLock and WriteLock, which can be
|
|
33 |
implemented in different ways on different platforms. Both have an
|
|
34 |
unlock() method.
|
|
|
614
by Martin Pool
- unify two defintions of LockError |
35 |
"""
|
|
577
by Martin Pool
- merge portable lock module from John |
36 |
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
37 |
import errno |
|
2353.3.12
by John Arbash Meinel
Don't create the alternative lock types unless we are on windows. |
38 |
import sys |
|
577
by Martin Pool
- merge portable lock module from John |
39 |
|
|
2353.3.11
by John Arbash Meinel
Code cleanup |
40 |
from bzrlib import ( |
41 |
errors, |
|
42 |
osutils, |
|
43 |
trace, |
|
44 |
)
|
|
|
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
45 |
|
|
577
by Martin Pool
- merge portable lock module from John |
46 |
|
|
3224.5.32
by Andrew Bennetts
Tidy conditional imports in bzrlib/lock.py as suggested by John's review. |
47 |
try: |
48 |
import fcntl |
|
49 |
have_fcntl = True |
|
50 |
except ImportError: |
|
51 |
have_fcntl = False |
|
52 |
||
53 |
have_pywin32 = False |
|
54 |
have_ctypes_win32 = False |
|
55 |
if sys.platform == 'win32': |
|
56 |
import msvcrt |
|
57 |
try: |
|
58 |
import win32con, win32file, pywintypes, winerror |
|
59 |
have_pywin32 = True |
|
60 |
except ImportError: |
|
61 |
pass
|
|
62 |
||
63 |
try: |
|
64 |
import ctypes |
|
65 |
have_ctypes_win32 = True |
|
66 |
except ImportError: |
|
67 |
pass
|
|
68 |
||
69 |
||
|
2555.3.2
by Martin Pool
rename _base_Lock to _OSLock |
70 |
class _OSLock(object): |
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
71 |
|
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
72 |
def __init__(self): |
73 |
self.f = None |
|
|
2353.3.10
by John Arbash Meinel
Cleanup errors, and change ReadOnlyLockError to pass around more details. |
74 |
self.filename = None |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
75 |
|
|
615
by Martin Pool
Major rework of locking code: |
76 |
def _open(self, filename, filemode): |
|
2353.3.11
by John Arbash Meinel
Code cleanup |
77 |
self.filename = osutils.realpath(filename) |
|
656
by Martin Pool
- create branch lock files if they don't exist |
78 |
try: |
|
2353.3.10
by John Arbash Meinel
Cleanup errors, and change ReadOnlyLockError to pass around more details. |
79 |
self.f = open(self.filename, filemode) |
|
656
by Martin Pool
- create branch lock files if they don't exist |
80 |
return self.f |
81 |
except IOError, e: |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
82 |
if e.errno in (errno.EACCES, errno.EPERM): |
|
2872.5.1
by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701). |
83 |
raise errors.LockFailed(self.filename, str(e)) |
|
656
by Martin Pool
- create branch lock files if they don't exist |
84 |
if e.errno != errno.ENOENT: |
85 |
raise
|
|
86 |
||
87 |
# maybe this is an old branch (before may 2005)
|
|
|
2353.3.11
by John Arbash Meinel
Code cleanup |
88 |
trace.mutter("trying to create missing lock %r", self.filename) |
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
89 |
|
|
2353.3.10
by John Arbash Meinel
Cleanup errors, and change ReadOnlyLockError to pass around more details. |
90 |
self.f = open(self.filename, 'wb+') |
|
656
by Martin Pool
- create branch lock files if they don't exist |
91 |
return self.f |
92 |
||
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
93 |
def _clear_f(self): |
94 |
"""Clear the self.f attribute cleanly.""" |
|
95 |
if self.f: |
|
96 |
self.f.close() |
|
97 |
self.f = None |
|
98 |
||
|
615
by Martin Pool
Major rework of locking code: |
99 |
def __del__(self): |
100 |
if self.f: |
|
101 |
from warnings import warn |
|
102 |
warn("lock on %r not released" % self.f) |
|
103 |
self.unlock() |
|
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
104 |
|
|
615
by Martin Pool
Major rework of locking code: |
105 |
def unlock(self): |
106 |
raise NotImplementedError() |
|
107 |
||
108 |
||
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
109 |
_lock_classes = [] |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
110 |
|
111 |
||
112 |
if have_fcntl: |
|
113 |
LOCK_SH = fcntl.LOCK_SH |
|
114 |
LOCK_NB = fcntl.LOCK_NB |
|
115 |
lock_EX = fcntl.LOCK_EX |
|
116 |
||
|
615
by Martin Pool
Major rework of locking code: |
117 |
|
|
2555.3.2
by Martin Pool
rename _base_Lock to _OSLock |
118 |
class _fcntl_FileLock(_OSLock): |
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
119 |
|
120 |
def _unlock(self): |
|
|
1185.9.2
by Harald Meland
Use fcntl.lockf() rather than fcntl.flock() to support NFS file systems. |
121 |
fcntl.lockf(self.f, fcntl.LOCK_UN) |
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
122 |
self._clear_f() |
123 |
||
124 |
||
|
615
by Martin Pool
Major rework of locking code: |
125 |
class _fcntl_WriteLock(_fcntl_FileLock): |
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
126 |
|
|
2353.4.1
by John Arbash Meinel
(broken) Change fcntl locks to be properly exclusive within the same process. |
127 |
_open_locks = set() |
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
128 |
|
|
615
by Martin Pool
Major rework of locking code: |
129 |
def __init__(self, filename): |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
130 |
super(_fcntl_WriteLock, self).__init__() |
|
2353.4.2
by John Arbash Meinel
[merge] LockCleanup changes. |
131 |
# Check we can grab a lock before we actually open the file.
|
132 |
self.filename = osutils.realpath(filename) |
|
|
2363.3.3
by John Arbash Meinel
make Write locks not block on Read locks, so that revert tests don't fail |
133 |
if self.filename in _fcntl_WriteLock._open_locks: |
|
2353.4.1
by John Arbash Meinel
(broken) Change fcntl locks to be properly exclusive within the same process. |
134 |
self._clear_f() |
135 |
raise errors.LockContention(self.filename) |
|
136 |
||
|
2353.4.2
by John Arbash Meinel
[merge] LockCleanup changes. |
137 |
self._open(self.filename, 'rb+') |
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
138 |
# reserve a slot for this lock - even if the lockf call fails,
|
139 |
# at thisi point unlock() will be called, because self.f is set.
|
|
140 |
# TODO: make this fully threadsafe, if we decide we care.
|
|
|
2353.4.1
by John Arbash Meinel
(broken) Change fcntl locks to be properly exclusive within the same process. |
141 |
_fcntl_WriteLock._open_locks.add(self.filename) |
|
615
by Martin Pool
Major rework of locking code: |
142 |
try: |
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
143 |
# LOCK_NB will cause IOError to be raised if we can't grab a
|
144 |
# lock right away.
|
|
145 |
fcntl.lockf(self.f, fcntl.LOCK_EX | fcntl.LOCK_NB) |
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
146 |
except IOError, e: |
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
147 |
if e.errno in (errno.EAGAIN, errno.EACCES): |
148 |
# We couldn't grab the lock
|
|
149 |
self.unlock() |
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
150 |
# we should be more precise about whats a locking
|
151 |
# error and whats a random-other error
|
|
|
2323.9.1
by John Arbash Meinel
Raise LockContetion rather than LockError |
152 |
raise errors.LockContention(e) |
|
615
by Martin Pool
Major rework of locking code: |
153 |
|
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
154 |
def unlock(self): |
|
2353.4.1
by John Arbash Meinel
(broken) Change fcntl locks to be properly exclusive within the same process. |
155 |
_fcntl_WriteLock._open_locks.remove(self.filename) |
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
156 |
self._unlock() |
157 |
||
158 |
||
|
615
by Martin Pool
Major rework of locking code: |
159 |
class _fcntl_ReadLock(_fcntl_FileLock): |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
160 |
|
|
2353.4.1
by John Arbash Meinel
(broken) Change fcntl locks to be properly exclusive within the same process. |
161 |
_open_locks = {} |
|
2353.3.3
by John Arbash Meinel
Define an explicit error when trying to grab a write lock on a readonly file. |
162 |
|
|
2353.4.11
by John Arbash Meinel
Remove the unused _ignore_write_lock parameter. |
163 |
def __init__(self, filename): |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
164 |
super(_fcntl_ReadLock, self).__init__() |
|
2353.4.2
by John Arbash Meinel
[merge] LockCleanup changes. |
165 |
self.filename = osutils.realpath(filename) |
|
2353.4.1
by John Arbash Meinel
(broken) Change fcntl locks to be properly exclusive within the same process. |
166 |
_fcntl_ReadLock._open_locks.setdefault(self.filename, 0) |
167 |
_fcntl_ReadLock._open_locks[self.filename] += 1 |
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
168 |
self._open(filename, 'rb') |
|
615
by Martin Pool
Major rework of locking code: |
169 |
try: |
|
2255.10.2
by John Arbash Meinel
Update to dirstate locking. |
170 |
# LOCK_NB will cause IOError to be raised if we can't grab a
|
171 |
# lock right away.
|
|
172 |
fcntl.lockf(self.f, fcntl.LOCK_SH | fcntl.LOCK_NB) |
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
173 |
except IOError, e: |
174 |
# we should be more precise about whats a locking
|
|
175 |
# error and whats a random-other error
|
|
|
2323.9.1
by John Arbash Meinel
Raise LockContetion rather than LockError |
176 |
raise errors.LockContention(e) |
|
615
by Martin Pool
Major rework of locking code: |
177 |
|
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
178 |
def unlock(self): |
|
2353.4.1
by John Arbash Meinel
(broken) Change fcntl locks to be properly exclusive within the same process. |
179 |
count = _fcntl_ReadLock._open_locks[self.filename] |
180 |
if count == 1: |
|
181 |
del _fcntl_ReadLock._open_locks[self.filename] |
|
182 |
else: |
|
183 |
_fcntl_ReadLock._open_locks[self.filename] = count - 1 |
|
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
184 |
self._unlock() |
185 |
||
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
186 |
def temporary_write_lock(self): |
187 |
"""Try to grab a write lock on the file. |
|
188 |
||
189 |
On platforms that support it, this will upgrade to a write lock
|
|
190 |
without unlocking the file.
|
|
191 |
Otherwise, this will release the read lock, and try to acquire a
|
|
192 |
write lock.
|
|
193 |
||
194 |
:return: A token which can be used to switch back to a read lock.
|
|
195 |
"""
|
|
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
196 |
if self.filename in _fcntl_WriteLock._open_locks: |
197 |
raise AssertionError('file already locked: %r' |
|
198 |
% (self.filename,)) |
|
|
2353.4.7
by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object, |
199 |
try: |
200 |
wlock = _fcntl_TemporaryWriteLock(self) |
|
201 |
except errors.LockError: |
|
202 |
# We didn't unlock, so we can just return 'self'
|
|
203 |
return False, self |
|
204 |
return True, wlock |
|
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
205 |
|
206 |
||
|
2555.3.2
by Martin Pool
rename _base_Lock to _OSLock |
207 |
class _fcntl_TemporaryWriteLock(_OSLock): |
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
208 |
"""A token used when grabbing a temporary_write_lock. |
209 |
||
210 |
Call restore_read_lock() when you are done with the write lock.
|
|
211 |
"""
|
|
212 |
||
213 |
def __init__(self, read_lock): |
|
214 |
super(_fcntl_TemporaryWriteLock, self).__init__() |
|
215 |
self._read_lock = read_lock |
|
216 |
self.filename = read_lock.filename |
|
217 |
||
218 |
count = _fcntl_ReadLock._open_locks[self.filename] |
|
219 |
if count > 1: |
|
220 |
# Something else also has a read-lock, so we cannot grab a
|
|
221 |
# write lock.
|
|
222 |
raise errors.LockContention(self.filename) |
|
223 |
||
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
224 |
if self.filename in _fcntl_WriteLock._open_locks: |
225 |
raise AssertionError('file already locked: %r' |
|
226 |
% (self.filename,)) |
|
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
227 |
|
228 |
# See if we can open the file for writing. Another process might
|
|
229 |
# have a read lock. We don't use self._open() because we don't want
|
|
230 |
# to create the file if it exists. That would have already been
|
|
231 |
# done by _fcntl_ReadLock
|
|
232 |
try: |
|
233 |
new_f = open(self.filename, 'rb+') |
|
234 |
except IOError, e: |
|
235 |
if e.errno in (errno.EACCES, errno.EPERM): |
|
|
2872.5.1
by Martin Pool
Avoid internal error tracebacks on failure to lock on readonly transport (#129701). |
236 |
raise errors.LockFailed(self.filename, str(e)) |
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
237 |
raise
|
238 |
try: |
|
239 |
# LOCK_NB will cause IOError to be raised if we can't grab a
|
|
240 |
# lock right away.
|
|
|
2379.3.1
by John Arbash Meinel
Cherry-pick the 2 locking fixes from the 0.15 branch. |
241 |
fcntl.lockf(new_f, fcntl.LOCK_EX | fcntl.LOCK_NB) |
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
242 |
except IOError, e: |
243 |
# TODO: Raise a more specific error based on the type of error
|
|
|
2323.9.1
by John Arbash Meinel
Raise LockContetion rather than LockError |
244 |
raise errors.LockContention(e) |
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
245 |
_fcntl_WriteLock._open_locks.add(self.filename) |
246 |
||
247 |
self.f = new_f |
|
248 |
||
249 |
def restore_read_lock(self): |
|
|
2353.4.4
by John Arbash Meinel
Implement temporary_write_lock, and restore_read_lock for win32 locks. |
250 |
"""Restore the original ReadLock.""" |
251 |
# For fcntl, since we never released the read lock, just release the
|
|
252 |
# write lock, and return the original lock.
|
|
|
2353.4.3
by John Arbash Meinel
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process. |
253 |
fcntl.lockf(self.f, fcntl.LOCK_UN) |
254 |
self._clear_f() |
|
255 |
_fcntl_WriteLock._open_locks.remove(self.filename) |
|
256 |
# Avoid reference cycles
|
|
257 |
read_lock = self._read_lock |
|
258 |
self._read_lock = None |
|
259 |
return read_lock |
|
260 |
||
|
1852.4.3
by Robert Collins
Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals. |
261 |
|
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
262 |
_lock_classes.append(('fcntl', _fcntl_WriteLock, _fcntl_ReadLock)) |
|
577
by Martin Pool
- merge portable lock module from John |
263 |
|
|
2353.3.11
by John Arbash Meinel
Code cleanup |
264 |
|
|
2353.3.12
by John Arbash Meinel
Don't create the alternative lock types unless we are on windows. |
265 |
if have_pywin32 and sys.platform == 'win32': |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
266 |
LOCK_SH = 0 # the default |
267 |
LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK |
|
268 |
LOCK_NB = win32con.LOCKFILE_FAIL_IMMEDIATELY |
|
269 |
||
270 |
||
|
2555.3.2
by Martin Pool
rename _base_Lock to _OSLock |
271 |
class _w32c_FileLock(_OSLock): |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
272 |
|
273 |
def _lock(self, filename, openmode, lockmode): |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
274 |
self._open(filename, openmode) |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
275 |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
276 |
self.hfile = msvcrt.get_osfhandle(self.f.fileno()) |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
277 |
overlapped = pywintypes.OVERLAPPED() |
278 |
try: |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
279 |
win32file.LockFileEx(self.hfile, lockmode, 0, 0x7fff0000, |
280 |
overlapped) |
|
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
281 |
except pywintypes.error, e: |
282 |
self._clear_f() |
|
283 |
if e.args[0] in (winerror.ERROR_LOCK_VIOLATION,): |
|
284 |
raise errors.LockContention(filename) |
|
285 |
## import pdb; pdb.set_trace()
|
|
286 |
raise
|
|
287 |
except Exception, e: |
|
288 |
self._clear_f() |
|
|
2323.9.1
by John Arbash Meinel
Raise LockContetion rather than LockError |
289 |
raise errors.LockContention(e) |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
290 |
|
291 |
def unlock(self): |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
292 |
overlapped = pywintypes.OVERLAPPED() |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
293 |
try: |
294 |
win32file.UnlockFileEx(self.hfile, 0, 0x7fff0000, overlapped) |
|
295 |
self._clear_f() |
|
296 |
except Exception, e: |
|
|
2323.9.1
by John Arbash Meinel
Raise LockContetion rather than LockError |
297 |
raise errors.LockContention(e) |
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
298 |
|
299 |
||
300 |
class _w32c_ReadLock(_w32c_FileLock): |
|
301 |
def __init__(self, filename): |
|
302 |
super(_w32c_ReadLock, self).__init__() |
|
303 |
self._lock(filename, 'rb', LOCK_SH + LOCK_NB) |
|
304 |
||
|
2353.4.4
by John Arbash Meinel
Implement temporary_write_lock, and restore_read_lock for win32 locks. |
305 |
def temporary_write_lock(self): |
306 |
"""Try to grab a write lock on the file. |
|
307 |
||
308 |
On platforms that support it, this will upgrade to a write lock
|
|
309 |
without unlocking the file.
|
|
310 |
Otherwise, this will release the read lock, and try to acquire a
|
|
311 |
write lock.
|
|
312 |
||
313 |
:return: A token which can be used to switch back to a read lock.
|
|
314 |
"""
|
|
315 |
# I can't find a way to upgrade a read lock to a write lock without
|
|
316 |
# unlocking first. So here, we do just that.
|
|
317 |
self.unlock() |
|
|
2353.4.7
by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object, |
318 |
try: |
319 |
wlock = _w32c_WriteLock(self.filename) |
|
320 |
except errors.LockError: |
|
321 |
return False, _w32c_ReadLock(self.filename) |
|
322 |
return True, wlock |
|
|
2353.4.4
by John Arbash Meinel
Implement temporary_write_lock, and restore_read_lock for win32 locks. |
323 |
|
|
2353.3.11
by John Arbash Meinel
Code cleanup |
324 |
|
|
2353.3.4
by John Arbash Meinel
Clean up the lock.py code to use less indenting, and conform to better coding practise. |
325 |
class _w32c_WriteLock(_w32c_FileLock): |
326 |
def __init__(self, filename): |
|
327 |
super(_w32c_WriteLock, self).__init__() |
|
328 |
self._lock(filename, 'rb+', LOCK_EX + LOCK_NB) |
|
329 |
||
|
2353.4.4
by John Arbash Meinel
Implement temporary_write_lock, and restore_read_lock for win32 locks. |
330 |
def restore_read_lock(self): |
331 |
"""Restore the original ReadLock.""" |
|
332 |
# For win32 we had to completely let go of the original lock, so we
|
|
333 |
# just unlock and create a new read lock.
|
|
334 |
self.unlock() |
|
335 |
return _w32c_ReadLock(self.filename) |
|
336 |
||
|
2353.3.11
by John Arbash Meinel
Code cleanup |
337 |
|
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
338 |
_lock_classes.append(('pywin32', _w32c_WriteLock, _w32c_ReadLock)) |
339 |
||
|
2353.3.11
by John Arbash Meinel
Code cleanup |
340 |
|
|
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
341 |
if have_ctypes_win32: |
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
342 |
# These constants were copied from the win32con.py module.
|
343 |
LOCKFILE_FAIL_IMMEDIATELY = 1 |
|
344 |
LOCKFILE_EXCLUSIVE_LOCK = 2 |
|
345 |
# Constant taken from winerror.py module
|
|
346 |
ERROR_LOCK_VIOLATION = 33 |
|
347 |
||
348 |
LOCK_SH = 0 |
|
349 |
LOCK_EX = LOCKFILE_EXCLUSIVE_LOCK |
|
350 |
LOCK_NB = LOCKFILE_FAIL_IMMEDIATELY |
|
351 |
_LockFileEx = ctypes.windll.kernel32.LockFileEx |
|
352 |
_UnlockFileEx = ctypes.windll.kernel32.UnlockFileEx |
|
353 |
_GetLastError = ctypes.windll.kernel32.GetLastError |
|
354 |
||
355 |
### Define the OVERLAPPED structure.
|
|
356 |
# http://msdn2.microsoft.com/en-us/library/ms684342.aspx
|
|
357 |
# typedef struct _OVERLAPPED {
|
|
358 |
# ULONG_PTR Internal;
|
|
359 |
# ULONG_PTR InternalHigh;
|
|
360 |
# union {
|
|
361 |
# struct {
|
|
362 |
# DWORD Offset;
|
|
363 |
# DWORD OffsetHigh;
|
|
364 |
# };
|
|
365 |
# PVOID Pointer;
|
|
366 |
# };
|
|
367 |
# HANDLE hEvent;
|
|
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
368 |
# } OVERLAPPED,
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
369 |
|
370 |
class _inner_struct(ctypes.Structure): |
|
371 |
_fields_ = [('Offset', ctypes.c_uint), # DWORD |
|
372 |
('OffsetHigh', ctypes.c_uint), # DWORD |
|
373 |
]
|
|
374 |
||
375 |
class _inner_union(ctypes.Union): |
|
376 |
_fields_ = [('anon_struct', _inner_struct), # struct |
|
377 |
('Pointer', ctypes.c_void_p), # PVOID |
|
378 |
]
|
|
379 |
||
380 |
class OVERLAPPED(ctypes.Structure): |
|
381 |
_fields_ = [('Internal', ctypes.c_void_p), # ULONG_PTR |
|
382 |
('InternalHigh', ctypes.c_void_p), # ULONG_PTR |
|
383 |
('_inner_union', _inner_union), |
|
384 |
('hEvent', ctypes.c_void_p), # HANDLE |
|
385 |
]
|
|
386 |
||
|
2555.3.2
by Martin Pool
rename _base_Lock to _OSLock |
387 |
class _ctypes_FileLock(_OSLock): |
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
388 |
|
389 |
def _lock(self, filename, openmode, lockmode): |
|
390 |
self._open(filename, openmode) |
|
391 |
||
392 |
self.hfile = msvcrt.get_osfhandle(self.f.fileno()) |
|
393 |
overlapped = OVERLAPPED() |
|
394 |
result = _LockFileEx(self.hfile, # HANDLE hFile |
|
395 |
lockmode, # DWORD dwFlags |
|
396 |
0, # DWORD dwReserved |
|
397 |
0x7fffffff, # DWORD nNumberOfBytesToLockLow |
|
398 |
0x00000000, # DWORD nNumberOfBytesToLockHigh |
|
|
2353.4.9
by John Arbash Meinel
[merge] bzr.dev 2359 |
399 |
ctypes.byref(overlapped), # lpOverlapped |
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
400 |
)
|
401 |
if result == 0: |
|
402 |
self._clear_f() |
|
403 |
last_err = _GetLastError() |
|
404 |
if last_err in (ERROR_LOCK_VIOLATION,): |
|
405 |
raise errors.LockContention(filename) |
|
|
2323.9.1
by John Arbash Meinel
Raise LockContetion rather than LockError |
406 |
raise errors.LockContention('Unknown locking error: %s' |
407 |
% (last_err,)) |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
408 |
|
409 |
def unlock(self): |
|
410 |
overlapped = OVERLAPPED() |
|
411 |
result = _UnlockFileEx(self.hfile, # HANDLE hFile |
|
412 |
0, # DWORD dwReserved |
|
413 |
0x7fffffff, # DWORD nNumberOfBytesToLockLow |
|
414 |
0x00000000, # DWORD nNumberOfBytesToLockHigh |
|
|
2353.4.9
by John Arbash Meinel
[merge] bzr.dev 2359 |
415 |
ctypes.byref(overlapped), # lpOverlapped |
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
416 |
)
|
417 |
self._clear_f() |
|
418 |
if result == 0: |
|
419 |
self._clear_f() |
|
420 |
last_err = _GetLastError() |
|
|
2323.9.1
by John Arbash Meinel
Raise LockContetion rather than LockError |
421 |
raise errors.LockContention('Unknown unlocking error: %s' |
422 |
% (last_err,)) |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
423 |
|
424 |
||
425 |
class _ctypes_ReadLock(_ctypes_FileLock): |
|
426 |
def __init__(self, filename): |
|
427 |
super(_ctypes_ReadLock, self).__init__() |
|
428 |
self._lock(filename, 'rb', LOCK_SH + LOCK_NB) |
|
429 |
||
|
2353.4.4
by John Arbash Meinel
Implement temporary_write_lock, and restore_read_lock for win32 locks. |
430 |
def temporary_write_lock(self): |
431 |
"""Try to grab a write lock on the file. |
|
432 |
||
433 |
On platforms that support it, this will upgrade to a write lock
|
|
434 |
without unlocking the file.
|
|
435 |
Otherwise, this will release the read lock, and try to acquire a
|
|
436 |
write lock.
|
|
437 |
||
438 |
:return: A token which can be used to switch back to a read lock.
|
|
439 |
"""
|
|
440 |
# I can't find a way to upgrade a read lock to a write lock without
|
|
441 |
# unlocking first. So here, we do just that.
|
|
442 |
self.unlock() |
|
|
2353.4.7
by John Arbash Meinel
Change the temporary_write_lock api, so that it always returns a lock object, |
443 |
try: |
444 |
wlock = _ctypes_WriteLock(self.filename) |
|
445 |
except errors.LockError: |
|
446 |
return False, _ctypes_ReadLock(self.filename) |
|
447 |
return True, wlock |
|
|
2353.3.11
by John Arbash Meinel
Code cleanup |
448 |
|
|
2353.3.5
by John Arbash Meinel
Fall back on ctypes to get LockFileEx, because msvcrt.locking() |
449 |
class _ctypes_WriteLock(_ctypes_FileLock): |
450 |
def __init__(self, filename): |
|
451 |
super(_ctypes_WriteLock, self).__init__() |
|
452 |
self._lock(filename, 'rb+', LOCK_EX + LOCK_NB) |
|
453 |
||
|
2353.4.4
by John Arbash Meinel
Implement temporary_write_lock, and restore_read_lock for win32 locks. |
454 |
def restore_read_lock(self): |
455 |
"""Restore the original ReadLock.""" |
|
456 |
# For win32 we had to completely let go of the original lock, so we
|
|
457 |
# just unlock and create a new read lock.
|
|
458 |
self.unlock() |
|
|
2353.4.6
by John Arbash Meinel
ctypes locks should return ctypes locks. |
459 |
return _ctypes_ReadLock(self.filename) |
|
2353.4.4
by John Arbash Meinel
Implement temporary_write_lock, and restore_read_lock for win32 locks. |
460 |
|
|
2353.3.11
by John Arbash Meinel
Code cleanup |
461 |
|
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
462 |
_lock_classes.append(('ctypes', _ctypes_WriteLock, _ctypes_ReadLock)) |
463 |
||
464 |
||
465 |
if len(_lock_classes) == 0: |
|
|
2353.3.11
by John Arbash Meinel
Code cleanup |
466 |
raise NotImplementedError( |
467 |
"We must have one of fcntl, pywin32, or ctypes available"
|
|
468 |
" to support OS locking."
|
|
469 |
)
|
|
470 |
||
|
2353.3.9
by John Arbash Meinel
Update the lock code and test code so that if more than one |
471 |
|
472 |
# We default to using the first available lock class.
|
|
473 |
_lock_type, WriteLock, ReadLock = _lock_classes[0] |
|
474 |