Merge lp:~ken-vandine/gwibber/lp_906916 into lp:gwibber

[Ken VanDine]

Drop the use of threading.Thread just to create a multiprocessing pool and ensure the pool gets closed after operations are done. This prevents the constant polling between workers which caused frequent wakeups and excessive power use.

[Michael Terry (mterry)]

Looks great!

review: Approve

=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2011-11-01 13:54:37 +0000
+++ gwibber/microblog/dispatcher.py	2012-01-13 08:25:41 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import multiprocessing, threading, traceback, json
+import multiprocessing, traceback, json
 import gobject, dbus, dbus.service
 import sqlite3, mx.DateTime, re, uuid
 import urlshorter, storage, network, util, uploader
@@ -165,11 +165,11 @@
   def validate_operation(self, acct, opname, enabled="receive_enabled"):
     # if account doesn't have the required feature or is disabled, return
     if enabled in acct:
-      if not acct[enabled]: return
+      if not acct[enabled]: return False
     else: 
-      return
+      return False
     # if there is an account for a service that gwibber doesn't no about, return
-    if not acct["service"] in SERVICES: return
+    if not acct["service"] in SERVICES: return False
     service = SERVICES[acct["service"]]
     return acct["service"] in PROTOCOLS and \
            opname in service["features"] and \
@@ -230,23 +230,6 @@
       for o in self.search_to_operations(search):
         yield o
 
-class MapAsync(threading.Thread):
-  def __init__(self, func, iterable, cbsuccess, cbfailure, pool):
-    threading.Thread.__init__(self)
-    self.iterable = iterable
-    self.callback = cbsuccess
-    self.failure = cbfailure
-    self.daemon = True
-    self.func = func
-    self.pool = pool
-    self.start()
-
-  def run(self):
-    try:
-      self.pool.map_async(self.func, self.iterable, callback = self.callback)
-    except Exception as e:
-      self.failure(e, traceback.format_exc())
-
 class Dispatcher(dbus.service.Object):
   """
   The Gwibber Dispatcher handles all the backend operations.
@@ -340,7 +323,6 @@
       self.launcher.set_property("count_visible", False)
 
     self.refresh_count = 0
-    self.workerpool = multiprocessing.Pool()
 
     self.refresh_timer_id = None
 
@@ -664,9 +646,14 @@
       util.notify(error["account"]["service"], error["message"], icon, 2000)
     self.notified_errors[error["account"]["service"]] = error["message"]
 
-  def perform_async_operation(self, iterable):
-    t = MapAsync(perform_operation, iterable, self.loading_complete, self.loading_failed, self.workerpool)
-    t.join()
+  def perform_async_operation (self, iterable):
+    pool = multiprocessing.Pool ()
+    try:
+      pool.map_async (perform_operation, iterable, callback = self.loading_complete)
+    except Exception as e:
+      self.loading_failed (e, traceback.format_exc())
+    pool.close ()
+    pool.join ()
   
   def loading_complete(self, output):
     self.refresh_count += 1