Added performance test, improved iterator task which will now be usable by default. It shows that there must be the notion of a producer, which can work if there are no items read

1 files changed, 25 insertions, 13 deletions

diff --git a/test/git/async/task.py b/test/git/async/task.py
index 9cc3cb9d..f3599efe 100644
--- a/test/git/async/task.py
+++ b/test/git/async/task.py
@@ -102,6 +102,14 @@ class TestThreadInputChannelTaskNode(_TestTaskBase, InputChannelTask):
 		# END handle tuple
 
 
+class TestThreadPerformanceTaskNode(InputChannelTask):
+	"""Applies no operation to the item, and does not lock, measuring
+	the actual throughput of the system"""
+	
+	def do_fun(self, item):
+		return item
+
+
 class TestThreadInputChannelVerifyTaskNode(_TestTaskBase, InputChannelTask):
 	"""An input channel task, which verifies the result of its input channels, 
 	should be last in the chain.
@@ -121,7 +129,6 @@ class TestThreadInputChannelVerifyTaskNode(_TestTaskBase, InputChannelTask):
 		
 		return item
 
-	
 #{ Utilities
 
 def make_proxy_method(t):
@@ -129,7 +136,9 @@ def make_proxy_method(t):
 	wt = weakref.proxy(t)
 	return lambda item: wt.do_fun(item)
 
-def add_task_chain(p, ni, count=1, fail_setup=list(), feeder_channel=None, id_offset=0):
+def add_task_chain(p, ni, count=1, fail_setup=list(), feeder_channel=None, id_offset=0, 
+					feedercls=TestThreadTaskNode, transformercls=TestThreadInputChannelTaskNode, 
+					include_verifier=True):
 	"""Create a task chain of feeder, count transformers and order verifcator 
 	to the pool p, like t1 -> t2 -> t3
 	:param fail_setup: a list of pairs, task_id, fail_after, i.e. [(2, 20)] would 
@@ -145,7 +154,7 @@ def add_task_chain(p, ni, count=1, fail_setup=list(), feeder_channel=None, id_of
 	feeder = None
 	frc = feeder_channel
 	if feeder_channel is None:
-		feeder = make_iterator_task(ni)
+		feeder = make_iterator_task(ni, taskcls=feedercls)
 		frc = p.add_task(feeder)
 	# END handle specific feeder
 	
@@ -154,7 +163,7 @@ def add_task_chain(p, ni, count=1, fail_setup=list(), feeder_channel=None, id_of
 	
 	inrc = frc
 	for tc in xrange(count):
-		t = TestThreadInputChannelTaskNode(inrc, tc+id_offset, None)
+		t = transformercls(inrc, tc+id_offset, None)
 		
 		t.fun = make_proxy_method(t)
 		#t.fun = t.do_fun
@@ -169,14 +178,16 @@ def add_task_chain(p, ni, count=1, fail_setup=list(), feeder_channel=None, id_of
 		tasks[1+id].fail_after = fail_after
 	# END setup failure 
 	
-	verifier = TestThreadInputChannelVerifyTaskNode(inrc, 'verifier', None)
-	#verifier.fun = verifier.do_fun
-	verifier.fun = make_proxy_method(verifier)
-	vrc = p.add_task(verifier)
-	
-	
-	tasks.append(verifier)
-	rcs.append(vrc)
+	if include_verifier:
+		verifier = TestThreadInputChannelVerifyTaskNode(inrc, 'verifier', None)
+		#verifier.fun = verifier.do_fun
+		verifier.fun = make_proxy_method(verifier)
+		vrc = p.add_task(verifier)
+		
+		
+		tasks.append(verifier)
+		rcs.append(vrc)
+	# END handle include verifier
 	return tasks, rcs
 	
 def make_iterator_task(ni, taskcls=TestThreadTaskNode, **kwargs):
@@ -184,7 +195,8 @@ def make_iterator_task(ni, taskcls=TestThreadTaskNode, **kwargs):
 	:param taskcls: the actual iterator type to use
 	:param **kwargs: additional kwargs to be passed to the task"""
 	t = taskcls(iter(range(ni)), 'iterator', None, **kwargs)
-	t.fun = make_proxy_method(t)
+	if isinstance(t, _TestTaskBase):
+		t.fun = make_proxy_method(t)
 	return t
 
 #} END utilities