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  | 
|
| 
2555.3.2
by Martin Pool
 rename _base_Lock to _OSLock  | 
47  | 
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.  | 
48  | 
|
| 
2353.3.4
by John Arbash Meinel
 Clean up the lock.py code to use less indenting, and conform to better coding practise.  | 
49  | 
def __init__(self):  | 
50  | 
self.f = None  | 
|
| 
2353.3.10
by John Arbash Meinel
 Cleanup errors, and change ReadOnlyLockError to pass around more details.  | 
51  | 
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.  | 
52  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
53  | 
def _open(self, filename, filemode):  | 
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
54  | 
self.filename = osutils.realpath(filename)  | 
| 
656
by Martin Pool
 - create branch lock files if they don't exist  | 
55  | 
try:  | 
| 
2353.3.10
by John Arbash Meinel
 Cleanup errors, and change ReadOnlyLockError to pass around more details.  | 
56  | 
self.f = open(self.filename, filemode)  | 
| 
656
by Martin Pool
 - create branch lock files if they don't exist  | 
57  | 
return self.f  | 
58  | 
except IOError, e:  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
59  | 
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).  | 
60  | 
raise errors.LockFailed(self.filename, str(e))  | 
| 
656
by Martin Pool
 - create branch lock files if they don't exist  | 
61  | 
if e.errno != errno.ENOENT:  | 
62  | 
                raise
 | 
|
63  | 
||
64  | 
            # maybe this is an old branch (before may 2005)
 | 
|
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
65  | 
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  | 
66  | 
|
| 
2353.3.10
by John Arbash Meinel
 Cleanup errors, and change ReadOnlyLockError to pass around more details.  | 
67  | 
self.f = open(self.filename, 'wb+')  | 
| 
656
by Martin Pool
 - create branch lock files if they don't exist  | 
68  | 
return self.f  | 
69  | 
||
| 
2353.3.4
by John Arbash Meinel
 Clean up the lock.py code to use less indenting, and conform to better coding practise.  | 
70  | 
def _clear_f(self):  | 
71  | 
"""Clear the self.f attribute cleanly."""  | 
|
72  | 
if self.f:  | 
|
73  | 
self.f.close()  | 
|
74  | 
self.f = None  | 
|
75  | 
||
| 
615
by Martin Pool
 Major rework of locking code:  | 
76  | 
def __del__(self):  | 
77  | 
if self.f:  | 
|
78  | 
from warnings import warn  | 
|
79  | 
warn("lock on %r not released" % self.f)  | 
|
80  | 
self.unlock()  | 
|
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
81  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
82  | 
def unlock(self):  | 
83  | 
raise NotImplementedError()  | 
|
84  | 
||
85  | 
||
| 
577
by Martin Pool
 - merge portable lock module from John  | 
86  | 
try:  | 
87  | 
import fcntl  | 
|
| 
2353.3.4
by John Arbash Meinel
 Clean up the lock.py code to use less indenting, and conform to better coding practise.  | 
88  | 
have_fcntl = True  | 
89  | 
except ImportError:  | 
|
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
90  | 
have_fcntl = False  | 
| 
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.  | 
91  | 
|
92  | 
have_pywin32 = False  | 
|
93  | 
if sys.platform == 'win32':  | 
|
94  | 
try:  | 
|
95  | 
import win32con, win32file, pywintypes, winerror, msvcrt  | 
|
96  | 
have_pywin32 = True  | 
|
97  | 
except ImportError:  | 
|
98  | 
        pass
 | 
|
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
99  | 
|
100  | 
||
101  | 
_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.  | 
102  | 
|
103  | 
||
104  | 
if have_fcntl:  | 
|
105  | 
LOCK_SH = fcntl.LOCK_SH  | 
|
106  | 
LOCK_NB = fcntl.LOCK_NB  | 
|
107  | 
lock_EX = fcntl.LOCK_EX  | 
|
108  | 
||
| 
615
by Martin Pool
 Major rework of locking code:  | 
109  | 
|
| 
2555.3.2
by Martin Pool
 rename _base_Lock to _OSLock  | 
110  | 
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.  | 
111  | 
|
112  | 
def _unlock(self):  | 
|
| 
1185.9.2
by Harald Meland
 Use fcntl.lockf() rather than fcntl.flock() to support NFS file systems.  | 
113  | 
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.  | 
114  | 
self._clear_f()  | 
115  | 
||
116  | 
||
| 
615
by Martin Pool
 Major rework of locking code:  | 
117  | 
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.  | 
118  | 
|
| 
2353.4.1
by John Arbash Meinel
 (broken) Change fcntl locks to be properly exclusive within the same process.  | 
119  | 
_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.  | 
120  | 
|
| 
615
by Martin Pool
 Major rework of locking code:  | 
121  | 
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.  | 
122  | 
super(_fcntl_WriteLock, self).__init__()  | 
| 
2353.4.2
by John Arbash Meinel
 [merge] LockCleanup changes.  | 
123  | 
            # Check we can grab a lock before we actually open the file.
 | 
124  | 
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  | 
125  | 
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.  | 
126  | 
self._clear_f()  | 
127  | 
raise errors.LockContention(self.filename)  | 
|
128  | 
||
| 
2353.4.2
by John Arbash Meinel
 [merge] LockCleanup changes.  | 
129  | 
self._open(self.filename, 'rb+')  | 
| 
2255.10.2
by John Arbash Meinel
 Update to dirstate locking.  | 
130  | 
            # reserve a slot for this lock - even if the lockf call fails,
 | 
131  | 
            # at thisi point unlock() will be called, because self.f is set.
 | 
|
132  | 
            # 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.  | 
133  | 
_fcntl_WriteLock._open_locks.add(self.filename)  | 
| 
615
by Martin Pool
 Major rework of locking code:  | 
134  | 
try:  | 
| 
2255.10.2
by John Arbash Meinel
 Update to dirstate locking.  | 
135  | 
                # LOCK_NB will cause IOError to be raised if we can't grab a
 | 
136  | 
                # lock right away.
 | 
|
137  | 
fcntl.lockf(self.f, fcntl.LOCK_EX | fcntl.LOCK_NB)  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
138  | 
except IOError, e:  | 
| 
2255.10.2
by John Arbash Meinel
 Update to dirstate locking.  | 
139  | 
if e.errno in (errno.EAGAIN, errno.EACCES):  | 
140  | 
                    # We couldn't grab the lock
 | 
|
141  | 
self.unlock()  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
142  | 
                # we should be more precise about whats a locking
 | 
143  | 
                # error and whats a random-other error
 | 
|
| 
2323.9.1
by John Arbash Meinel
 Raise LockContetion rather than LockError  | 
144  | 
raise errors.LockContention(e)  | 
| 
615
by Martin Pool
 Major rework of locking code:  | 
145  | 
|
| 
1852.4.3
by Robert Collins
 Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals.  | 
146  | 
def unlock(self):  | 
| 
2353.4.1
by John Arbash Meinel
 (broken) Change fcntl locks to be properly exclusive within the same process.  | 
147  | 
_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.  | 
148  | 
self._unlock()  | 
149  | 
||
150  | 
||
| 
615
by Martin Pool
 Major rework of locking code:  | 
151  | 
class _fcntl_ReadLock(_fcntl_FileLock):  | 
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
152  | 
|
| 
2353.4.1
by John Arbash Meinel
 (broken) Change fcntl locks to be properly exclusive within the same process.  | 
153  | 
_open_locks = {}  | 
| 
2353.3.3
by John Arbash Meinel
 Define an explicit error when trying to grab a write lock on a readonly file.  | 
154  | 
|
| 
2353.4.11
by John Arbash Meinel
 Remove the unused _ignore_write_lock parameter.  | 
155  | 
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.  | 
156  | 
super(_fcntl_ReadLock, self).__init__()  | 
| 
2353.4.2
by John Arbash Meinel
 [merge] LockCleanup changes.  | 
157  | 
self.filename = osutils.realpath(filename)  | 
| 
2353.4.1
by John Arbash Meinel
 (broken) Change fcntl locks to be properly exclusive within the same process.  | 
158  | 
_fcntl_ReadLock._open_locks.setdefault(self.filename, 0)  | 
159  | 
_fcntl_ReadLock._open_locks[self.filename] += 1  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
160  | 
self._open(filename, 'rb')  | 
| 
615
by Martin Pool
 Major rework of locking code:  | 
161  | 
try:  | 
| 
2255.10.2
by John Arbash Meinel
 Update to dirstate locking.  | 
162  | 
                # LOCK_NB will cause IOError to be raised if we can't grab a
 | 
163  | 
                # lock right away.
 | 
|
164  | 
fcntl.lockf(self.f, fcntl.LOCK_SH | fcntl.LOCK_NB)  | 
|
| 
1185.65.29
by Robert Collins
 Implement final review suggestions.  | 
165  | 
except IOError, e:  | 
166  | 
                # we should be more precise about whats a locking
 | 
|
167  | 
                # error and whats a random-other error
 | 
|
| 
2323.9.1
by John Arbash Meinel
 Raise LockContetion rather than LockError  | 
168  | 
raise errors.LockContention(e)  | 
| 
615
by Martin Pool
 Major rework of locking code:  | 
169  | 
|
| 
1852.4.3
by Robert Collins
 Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals.  | 
170  | 
def unlock(self):  | 
| 
2353.4.1
by John Arbash Meinel
 (broken) Change fcntl locks to be properly exclusive within the same process.  | 
171  | 
count = _fcntl_ReadLock._open_locks[self.filename]  | 
172  | 
if count == 1:  | 
|
173  | 
del _fcntl_ReadLock._open_locks[self.filename]  | 
|
174  | 
else:  | 
|
175  | 
_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.  | 
176  | 
self._unlock()  | 
177  | 
||
| 
2353.4.3
by John Arbash Meinel
 Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process.  | 
178  | 
def temporary_write_lock(self):  | 
179  | 
"""Try to grab a write lock on the file.  | 
|
180  | 
||
181  | 
            On platforms that support it, this will upgrade to a write lock
 | 
|
182  | 
            without unlocking the file.
 | 
|
183  | 
            Otherwise, this will release the read lock, and try to acquire a
 | 
|
184  | 
            write lock.
 | 
|
185  | 
||
186  | 
            :return: A token which can be used to switch back to a read lock.
 | 
|
187  | 
            """
 | 
|
188  | 
assert self.filename not in _fcntl_WriteLock._open_locks  | 
|
| 
2353.4.7
by John Arbash Meinel
 Change the temporary_write_lock api, so that it always returns a lock object,  | 
189  | 
try:  | 
190  | 
wlock = _fcntl_TemporaryWriteLock(self)  | 
|
191  | 
except errors.LockError:  | 
|
192  | 
                # We didn't unlock, so we can just return 'self'
 | 
|
193  | 
return False, self  | 
|
194  | 
return True, wlock  | 
|
| 
2353.4.3
by John Arbash Meinel
 Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process.  | 
195  | 
|
196  | 
||
| 
2555.3.2
by Martin Pool
 rename _base_Lock to _OSLock  | 
197  | 
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.  | 
198  | 
"""A token used when grabbing a temporary_write_lock.  | 
199  | 
||
200  | 
        Call restore_read_lock() when you are done with the write lock.
 | 
|
201  | 
        """
 | 
|
202  | 
||
203  | 
def __init__(self, read_lock):  | 
|
204  | 
super(_fcntl_TemporaryWriteLock, self).__init__()  | 
|
205  | 
self._read_lock = read_lock  | 
|
206  | 
self.filename = read_lock.filename  | 
|
207  | 
||
208  | 
count = _fcntl_ReadLock._open_locks[self.filename]  | 
|
209  | 
if count > 1:  | 
|
210  | 
                # Something else also has a read-lock, so we cannot grab a
 | 
|
211  | 
                # write lock.
 | 
|
212  | 
raise errors.LockContention(self.filename)  | 
|
213  | 
||
214  | 
assert self.filename not in _fcntl_WriteLock._open_locks  | 
|
215  | 
||
216  | 
            # See if we can open the file for writing. Another process might
 | 
|
217  | 
            # have a read lock. We don't use self._open() because we don't want
 | 
|
218  | 
            # to create the file if it exists. That would have already been
 | 
|
219  | 
            # done by _fcntl_ReadLock
 | 
|
220  | 
try:  | 
|
221  | 
new_f = open(self.filename, 'rb+')  | 
|
222  | 
except IOError, e:  | 
|
223  | 
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).  | 
224  | 
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.  | 
225  | 
                raise
 | 
226  | 
try:  | 
|
227  | 
                # LOCK_NB will cause IOError to be raised if we can't grab a
 | 
|
228  | 
                # lock right away.
 | 
|
| 
2379.3.1
by John Arbash Meinel
 Cherry-pick the 2 locking fixes from the 0.15 branch.  | 
229  | 
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.  | 
230  | 
except IOError, e:  | 
231  | 
                # TODO: Raise a more specific error based on the type of error
 | 
|
| 
2323.9.1
by John Arbash Meinel
 Raise LockContetion rather than LockError  | 
232  | 
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.  | 
233  | 
_fcntl_WriteLock._open_locks.add(self.filename)  | 
234  | 
||
235  | 
self.f = new_f  | 
|
236  | 
||
237  | 
def restore_read_lock(self):  | 
|
| 
2353.4.4
by John Arbash Meinel
 Implement temporary_write_lock, and restore_read_lock for win32 locks.  | 
238  | 
"""Restore the original ReadLock."""  | 
239  | 
            # For fcntl, since we never released the read lock, just release the
 | 
|
240  | 
            # 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.  | 
241  | 
fcntl.lockf(self.f, fcntl.LOCK_UN)  | 
242  | 
self._clear_f()  | 
|
243  | 
_fcntl_WriteLock._open_locks.remove(self.filename)  | 
|
244  | 
            # Avoid reference cycles
 | 
|
245  | 
read_lock = self._read_lock  | 
|
246  | 
self._read_lock = None  | 
|
247  | 
return read_lock  | 
|
248  | 
||
| 
1852.4.3
by Robert Collins
 Alter working tree lock and unlock tests to test via the interface rather than via unpublished internals.  | 
249  | 
|
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
250  | 
_lock_classes.append(('fcntl', _fcntl_WriteLock, _fcntl_ReadLock))  | 
| 
577
by Martin Pool
 - merge portable lock module from John  | 
251  | 
|
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
252  | 
|
| 
2353.3.12
by John Arbash Meinel
 Don't create the alternative lock types unless we are on windows.  | 
253  | 
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.  | 
254  | 
LOCK_SH = 0 # the default  | 
255  | 
LOCK_EX = win32con.LOCKFILE_EXCLUSIVE_LOCK  | 
|
256  | 
LOCK_NB = win32con.LOCKFILE_FAIL_IMMEDIATELY  | 
|
257  | 
||
258  | 
||
| 
2555.3.2
by Martin Pool
 rename _base_Lock to _OSLock  | 
259  | 
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.  | 
260  | 
|
261  | 
def _lock(self, filename, openmode, lockmode):  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
262  | 
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.  | 
263  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
264  | 
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.  | 
265  | 
overlapped = pywintypes.OVERLAPPED()  | 
266  | 
try:  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
267  | 
win32file.LockFileEx(self.hfile, lockmode, 0, 0x7fff0000,  | 
268  | 
overlapped)  | 
|
| 
2353.3.4
by John Arbash Meinel
 Clean up the lock.py code to use less indenting, and conform to better coding practise.  | 
269  | 
except pywintypes.error, e:  | 
270  | 
self._clear_f()  | 
|
271  | 
if e.args[0] in (winerror.ERROR_LOCK_VIOLATION,):  | 
|
272  | 
raise errors.LockContention(filename)  | 
|
273  | 
                ## import pdb; pdb.set_trace()
 | 
|
274  | 
                raise
 | 
|
275  | 
except Exception, e:  | 
|
276  | 
self._clear_f()  | 
|
| 
2323.9.1
by John Arbash Meinel
 Raise LockContetion rather than LockError  | 
277  | 
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.  | 
278  | 
|
279  | 
def unlock(self):  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
280  | 
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.  | 
281  | 
try:  | 
282  | 
win32file.UnlockFileEx(self.hfile, 0, 0x7fff0000, overlapped)  | 
|
283  | 
self._clear_f()  | 
|
284  | 
except Exception, e:  | 
|
| 
2323.9.1
by John Arbash Meinel
 Raise LockContetion rather than LockError  | 
285  | 
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.  | 
286  | 
|
287  | 
||
288  | 
class _w32c_ReadLock(_w32c_FileLock):  | 
|
289  | 
def __init__(self, filename):  | 
|
290  | 
super(_w32c_ReadLock, self).__init__()  | 
|
291  | 
self._lock(filename, 'rb', LOCK_SH + LOCK_NB)  | 
|
292  | 
||
| 
2353.4.4
by John Arbash Meinel
 Implement temporary_write_lock, and restore_read_lock for win32 locks.  | 
293  | 
def temporary_write_lock(self):  | 
294  | 
"""Try to grab a write lock on the file.  | 
|
295  | 
||
296  | 
            On platforms that support it, this will upgrade to a write lock
 | 
|
297  | 
            without unlocking the file.
 | 
|
298  | 
            Otherwise, this will release the read lock, and try to acquire a
 | 
|
299  | 
            write lock.
 | 
|
300  | 
||
301  | 
            :return: A token which can be used to switch back to a read lock.
 | 
|
302  | 
            """
 | 
|
303  | 
            # I can't find a way to upgrade a read lock to a write lock without
 | 
|
304  | 
            # unlocking first. So here, we do just that.
 | 
|
305  | 
self.unlock()  | 
|
| 
2353.4.7
by John Arbash Meinel
 Change the temporary_write_lock api, so that it always returns a lock object,  | 
306  | 
try:  | 
307  | 
wlock = _w32c_WriteLock(self.filename)  | 
|
308  | 
except errors.LockError:  | 
|
309  | 
return False, _w32c_ReadLock(self.filename)  | 
|
310  | 
return True, wlock  | 
|
| 
2353.4.4
by John Arbash Meinel
 Implement temporary_write_lock, and restore_read_lock for win32 locks.  | 
311  | 
|
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
312  | 
|
| 
2353.3.4
by John Arbash Meinel
 Clean up the lock.py code to use less indenting, and conform to better coding practise.  | 
313  | 
class _w32c_WriteLock(_w32c_FileLock):  | 
314  | 
def __init__(self, filename):  | 
|
315  | 
super(_w32c_WriteLock, self).__init__()  | 
|
316  | 
self._lock(filename, 'rb+', LOCK_EX + LOCK_NB)  | 
|
317  | 
||
| 
2353.4.4
by John Arbash Meinel
 Implement temporary_write_lock, and restore_read_lock for win32 locks.  | 
318  | 
def restore_read_lock(self):  | 
319  | 
"""Restore the original ReadLock."""  | 
|
320  | 
            # For win32 we had to completely let go of the original lock, so we
 | 
|
321  | 
            # just unlock and create a new read lock.
 | 
|
322  | 
self.unlock()  | 
|
323  | 
return _w32c_ReadLock(self.filename)  | 
|
324  | 
||
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
325  | 
|
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
326  | 
_lock_classes.append(('pywin32', _w32c_WriteLock, _w32c_ReadLock))  | 
327  | 
||
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
328  | 
|
| 
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.  | 
329  | 
have_ctypes_win32 = False  | 
330  | 
if sys.platform == 'win32':  | 
|
331  | 
try:  | 
|
332  | 
import ctypes, msvcrt  | 
|
333  | 
have_ctypes_win32 = True  | 
|
334  | 
except ImportError:  | 
|
335  | 
        pass
 | 
|
336  | 
||
337  | 
if have_ctypes_win32:  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
338  | 
    # These constants were copied from the win32con.py module.
 | 
339  | 
LOCKFILE_FAIL_IMMEDIATELY = 1  | 
|
340  | 
LOCKFILE_EXCLUSIVE_LOCK = 2  | 
|
341  | 
    # Constant taken from winerror.py module
 | 
|
342  | 
ERROR_LOCK_VIOLATION = 33  | 
|
343  | 
||
344  | 
LOCK_SH = 0  | 
|
345  | 
LOCK_EX = LOCKFILE_EXCLUSIVE_LOCK  | 
|
346  | 
LOCK_NB = LOCKFILE_FAIL_IMMEDIATELY  | 
|
347  | 
_LockFileEx = ctypes.windll.kernel32.LockFileEx  | 
|
348  | 
_UnlockFileEx = ctypes.windll.kernel32.UnlockFileEx  | 
|
349  | 
_GetLastError = ctypes.windll.kernel32.GetLastError  | 
|
350  | 
||
351  | 
    ### Define the OVERLAPPED structure.
 | 
|
352  | 
    #   http://msdn2.microsoft.com/en-us/library/ms684342.aspx
 | 
|
353  | 
    # typedef struct _OVERLAPPED {
 | 
|
354  | 
    #   ULONG_PTR Internal;
 | 
|
355  | 
    #   ULONG_PTR InternalHigh;
 | 
|
356  | 
    #   union {
 | 
|
357  | 
    #     struct {
 | 
|
358  | 
    #       DWORD Offset;
 | 
|
359  | 
    #       DWORD OffsetHigh;
 | 
|
360  | 
    #     };
 | 
|
361  | 
    #     PVOID Pointer;
 | 
|
362  | 
    #   };
 | 
|
363  | 
    #   HANDLE hEvent;
 | 
|
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
364  | 
    # } OVERLAPPED,
 | 
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
365  | 
|
366  | 
class _inner_struct(ctypes.Structure):  | 
|
367  | 
_fields_ = [('Offset', ctypes.c_uint), # DWORD  | 
|
368  | 
('OffsetHigh', ctypes.c_uint), # DWORD  | 
|
369  | 
                   ]
 | 
|
370  | 
||
371  | 
class _inner_union(ctypes.Union):  | 
|
372  | 
_fields_ = [('anon_struct', _inner_struct), # struct  | 
|
373  | 
('Pointer', ctypes.c_void_p), # PVOID  | 
|
374  | 
                    ]
 | 
|
375  | 
||
376  | 
class OVERLAPPED(ctypes.Structure):  | 
|
377  | 
_fields_ = [('Internal', ctypes.c_void_p), # ULONG_PTR  | 
|
378  | 
('InternalHigh', ctypes.c_void_p), # ULONG_PTR  | 
|
379  | 
('_inner_union', _inner_union),  | 
|
380  | 
('hEvent', ctypes.c_void_p), # HANDLE  | 
|
381  | 
                   ]
 | 
|
382  | 
||
| 
2555.3.2
by Martin Pool
 rename _base_Lock to _OSLock  | 
383  | 
class _ctypes_FileLock(_OSLock):  | 
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
384  | 
|
385  | 
def _lock(self, filename, openmode, lockmode):  | 
|
386  | 
self._open(filename, openmode)  | 
|
387  | 
||
388  | 
self.hfile = msvcrt.get_osfhandle(self.f.fileno())  | 
|
389  | 
overlapped = OVERLAPPED()  | 
|
390  | 
result = _LockFileEx(self.hfile, # HANDLE hFile  | 
|
391  | 
lockmode, # DWORD dwFlags  | 
|
392  | 
0, # DWORD dwReserved  | 
|
393  | 
0x7fffffff, # DWORD nNumberOfBytesToLockLow  | 
|
394  | 
0x00000000, # DWORD nNumberOfBytesToLockHigh  | 
|
| 
2353.4.9
by John Arbash Meinel
 [merge] bzr.dev 2359  | 
395  | 
ctypes.byref(overlapped), # lpOverlapped  | 
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
396  | 
                                )
 | 
397  | 
if result == 0:  | 
|
398  | 
self._clear_f()  | 
|
399  | 
last_err = _GetLastError()  | 
|
400  | 
if last_err in (ERROR_LOCK_VIOLATION,):  | 
|
401  | 
raise errors.LockContention(filename)  | 
|
| 
2323.9.1
by John Arbash Meinel
 Raise LockContetion rather than LockError  | 
402  | 
raise errors.LockContention('Unknown locking error: %s'  | 
403  | 
% (last_err,))  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
404  | 
|
405  | 
def unlock(self):  | 
|
406  | 
overlapped = OVERLAPPED()  | 
|
407  | 
result = _UnlockFileEx(self.hfile, # HANDLE hFile  | 
|
408  | 
0, # DWORD dwReserved  | 
|
409  | 
0x7fffffff, # DWORD nNumberOfBytesToLockLow  | 
|
410  | 
0x00000000, # DWORD nNumberOfBytesToLockHigh  | 
|
| 
2353.4.9
by John Arbash Meinel
 [merge] bzr.dev 2359  | 
411  | 
ctypes.byref(overlapped), # lpOverlapped  | 
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
412  | 
                                  )
 | 
413  | 
self._clear_f()  | 
|
414  | 
if result == 0:  | 
|
415  | 
self._clear_f()  | 
|
416  | 
last_err = _GetLastError()  | 
|
| 
2323.9.1
by John Arbash Meinel
 Raise LockContetion rather than LockError  | 
417  | 
raise errors.LockContention('Unknown unlocking error: %s'  | 
418  | 
% (last_err,))  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
419  | 
|
420  | 
||
421  | 
class _ctypes_ReadLock(_ctypes_FileLock):  | 
|
422  | 
def __init__(self, filename):  | 
|
423  | 
super(_ctypes_ReadLock, self).__init__()  | 
|
424  | 
self._lock(filename, 'rb', LOCK_SH + LOCK_NB)  | 
|
425  | 
||
| 
2353.4.4
by John Arbash Meinel
 Implement temporary_write_lock, and restore_read_lock for win32 locks.  | 
426  | 
def temporary_write_lock(self):  | 
427  | 
"""Try to grab a write lock on the file.  | 
|
428  | 
||
429  | 
            On platforms that support it, this will upgrade to a write lock
 | 
|
430  | 
            without unlocking the file.
 | 
|
431  | 
            Otherwise, this will release the read lock, and try to acquire a
 | 
|
432  | 
            write lock.
 | 
|
433  | 
||
434  | 
            :return: A token which can be used to switch back to a read lock.
 | 
|
435  | 
            """
 | 
|
436  | 
            # I can't find a way to upgrade a read lock to a write lock without
 | 
|
437  | 
            # unlocking first. So here, we do just that.
 | 
|
438  | 
self.unlock()  | 
|
| 
2353.4.7
by John Arbash Meinel
 Change the temporary_write_lock api, so that it always returns a lock object,  | 
439  | 
try:  | 
440  | 
wlock = _ctypes_WriteLock(self.filename)  | 
|
441  | 
except errors.LockError:  | 
|
442  | 
return False, _ctypes_ReadLock(self.filename)  | 
|
443  | 
return True, wlock  | 
|
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
444  | 
|
| 
2353.3.5
by John Arbash Meinel
 Fall back on ctypes to get LockFileEx, because msvcrt.locking()  | 
445  | 
class _ctypes_WriteLock(_ctypes_FileLock):  | 
446  | 
def __init__(self, filename):  | 
|
447  | 
super(_ctypes_WriteLock, self).__init__()  | 
|
448  | 
self._lock(filename, 'rb+', LOCK_EX + LOCK_NB)  | 
|
449  | 
||
| 
2353.4.4
by John Arbash Meinel
 Implement temporary_write_lock, and restore_read_lock for win32 locks.  | 
450  | 
def restore_read_lock(self):  | 
451  | 
"""Restore the original ReadLock."""  | 
|
452  | 
            # For win32 we had to completely let go of the original lock, so we
 | 
|
453  | 
            # just unlock and create a new read lock.
 | 
|
454  | 
self.unlock()  | 
|
| 
2353.4.6
by John Arbash Meinel
 ctypes locks should return ctypes locks.  | 
455  | 
return _ctypes_ReadLock(self.filename)  | 
| 
2353.4.4
by John Arbash Meinel
 Implement temporary_write_lock, and restore_read_lock for win32 locks.  | 
456  | 
|
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
457  | 
|
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
458  | 
_lock_classes.append(('ctypes', _ctypes_WriteLock, _ctypes_ReadLock))  | 
459  | 
||
460  | 
||
461  | 
if len(_lock_classes) == 0:  | 
|
| 
2353.3.11
by John Arbash Meinel
 Code cleanup  | 
462  | 
raise NotImplementedError(  | 
463  | 
        "We must have one of fcntl, pywin32, or ctypes available"
 | 
|
464  | 
        " to support OS locking."
 | 
|
465  | 
        )
 | 
|
466  | 
||
| 
2353.3.9
by John Arbash Meinel
 Update the lock code and test code so that if more than one  | 
467  | 
|
468  | 
# We default to using the first available lock class.
 | 
|
469  | 
_lock_type, WriteLock, ReadLock = _lock_classes[0]  | 
|
470  |