summaryrefslogtreecommitdiff
path: root/lib/git/async/task.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-06-10 23:55:50 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-06-10 23:55:50 +0200
commitfbe062bf6dacd3ad63dd827d898337fa542931ac (patch)
treee3cac995265e0472f5ff9a2cc42f3c9e2eafaf95 /lib/git/async/task.py
parentc34343d0b714d2c4657972020afea034a167a682 (diff)
downloadgitpython-fbe062bf6dacd3ad63dd827d898337fa542931ac.tar.gz
Added dependency-task tests, and fixed plenty of ref-count related bugs, as well as concurrency issues. Now it works okay, but the thread-shutdown is still an issue, as it causes incorrect behaviour making the tests fail. Its good, as it hints at additional issues that need to be solved. There is just a little more left on the feature side, but its nearly there
Diffstat (limited to 'lib/git/async/task.py')
-rw-r--r--lib/git/async/task.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/git/async/task.py b/lib/git/async/task.py
index a8ba5ac6..49e7e7cf 100644
--- a/lib/git/async/task.py
+++ b/lib/git/async/task.py
@@ -82,7 +82,8 @@ class OutputChannelTask(Node):
def process(self, count=0):
"""Process count items and send the result individually to the output channel"""
- # first thing: increment the writer count
+ # first thing: increment the writer count - other tasks must be able
+ # to respond properly ( even if it turns out we don't need it later )
self._wlock.acquire()
self._num_writers += 1
self._wlock.release()
@@ -191,7 +192,11 @@ class InputIteratorTaskBase(OutputChannelTask):
raise ValueError("Iterator %r needs a next() function" % iterator)
self._iterator = iterator
self._lock = self.lock_type()
- self._read = self.__read
+
+ # this is necessary to prevent a cyclic ref, preventing us from
+ # getting deleted ( and collected )
+ weakself = weakref.ref(self)
+ self._read = lambda count: weakself().__read(count)
self._empty = False
def __read(self, count=0):
@@ -201,6 +206,7 @@ class InputIteratorTaskBase(OutputChannelTask):
if self._empty:
return list()
# END early abort
+
self._lock.acquire()
try:
if count == 0: