X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Futil%2Fgo_utils.py;h=52ccf922c0bb899b1ff7e1ca3764c1468de22e15;hb=bf4f61d07bfec7ef0b78940384d05ba42a92b06b;hp=38e20c23225697682fdf965fa12a020c02f67e0e;hpb=887113c5927f329599cc7044c7b689d1134f0dac;p=theonering

diff --git a/src/util/go_utils.py b/src/util/go_utils.py
index 38e20c2..52ccf92 100644
--- a/src/util/go_utils.py
+++ b/src/util/go_utils.py
@@ -168,6 +168,7 @@ class AsyncPool(object):
 		try:
 			callback(result)
 		except Exception:
+			_moduleLogger.exception("Callback errored")
 			pass
 		return False
 
@@ -183,6 +184,7 @@ class AsyncPool(object):
 				result = func(*args, **kwds)
 				isError = False
 			except Exception, e:
+				_moduleLogger.error("Error, passing it back to the main thread")
 				result = e
 				isError = True
 			self.__workQueue.task_done()
@@ -190,38 +192,56 @@ class AsyncPool(object):
 			gobject.idle_add(self.__trampoline_callback, on_success, on_error, isError, result)
 
 
-class LinearExecution(object):
+class AsyncLinearExecution(object):
 
-	def __init__(self, func):
+	def __init__(self, pool, func):
+		self._pool = pool
 		self._func = func
 		self._run = None
 
 	def start(self, *args, **kwds):
 		assert self._run is None
-		kwds["on_success"] = self.on_success
-		kwds["on_error"] = self.on_error
 		self._run = self._func(*args, **kwds)
 		trampoline, args, kwds = self._run.send(None) # priming the function
-		trampoline(*args, **kwds)
+		self._pool.add_task(
+			trampoline,
+			args,
+			kwds,
+			self.on_success,
+			self.on_error,
+		)
 
 	@misc.log_exception(_moduleLogger)
-	def on_success(self, *args, **kwds):
-		assert not kwds
+	def on_success(self, result):
+		_moduleLogger.debug("Processing success for: %r", self._func)
 		try:
-			trampoline, args, kwds = self._run.send(args)
+			trampoline, args, kwds = self._run.send(result)
 		except StopIteration, e:
 			pass
 		else:
-			trampoline(*args, **kwds)
+			self._pool.add_task(
+				trampoline,
+				args,
+				kwds,
+				self.on_success,
+				self.on_error,
+			)
 
 	@misc.log_exception(_moduleLogger)
 	def on_error(self, error):
+		_moduleLogger.debug("Processing error for: %r", self._func)
 		try:
 			trampoline, args, kwds = self._run.throw(error)
 		except StopIteration, e:
 			pass
 		else:
-			trampoline(*args, **kwds)
+			self._pool.add_task(
+				trampoline,
+				args,
+				kwds,
+				self.on_success,
+				self.on_error,
+			)
 
 
 def throttled(minDelay, queue):