sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.misc] FlockFile: move wait and acquired message callbacks to instance

Browse Source
This commit is contained in:
Fabio Erculiani
2013-12-01 18:54:11 +01:00
parent 2514ab2725
commit 8dd42f9663
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/entropy/misc.py
+13 -10
View File
@@ -583,6 +583,9 @@ class FlockFile(object):
"""
def __init__(self, file_path, fd = None, fobj = None):
self._wait_msg_cb = None
self._acquired_msg_cb = None
self._path = file_path
if fobj:
self._f = fobj
@@ -597,7 +600,7 @@ class FlockFile(object):
raise
@contextlib.contextmanager
def shared(self, _wait_msg_cb = None, _acquired_msg_cb = None):
def shared(self):
"""
Acquire the lock in shared mode (context manager).
"""
@@ -605,14 +608,14 @@ class FlockFile(object):
try:
acquired = self.try_acquire_shared()
if not acquired:
if _wait_msg_cb:
_wait_msg_cb()
if self._wait_msg_cb:
self._wait_msg_cb(False)
self.acquire_shared()
acquired = True
if _acquired_msg_cb:
_acquired_msg_cb()
if self._acquired_msg_cb:
self._acquired_msg_cb(False)
yield
@@ -621,7 +624,7 @@ class FlockFile(object):
self.release()
@contextlib.contextmanager
def exclusive(self, _wait_msg_cb = None, _acquired_msg_cb = None):
def exclusive(self):
"""
Acquire the lock in exclusive mode.
"""
@@ -629,14 +632,14 @@ class FlockFile(object):
try:
acquired = self.try_acquire_exclusive()
if not acquired:
if _wait_msg_cb:
_wait_msg_cb()
if self._wait_msg_cb:
self._wait_msg_cb(True)
self.acquire_exclusive()
acquired = True
if _acquired_msg_cb:
_acquired_msg_cb()
if self._acquired_msg_cb:
self._acquired_msg_cb(True)
yield