Merge pull request #287 from Atheros1/master

gevent

Author: Jonathan Warren

src/bitmessagemain.py

@@ -10,6 +10,12 @@
 # The software version variable is now held in shared.py
 
 #import ctypes
+try:
+    from gevent import monkey
+    monkey.patch_all()
+except ImportError as ex:
+    print "cannot find gevent"
+
 import signal  # Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully.
 # The next 3 are used for the API
 from SimpleXMLRPCServer import *
@@ -459,9 +465,9 @@ def _dispatch(self, method, params):
             status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
                 toAddress)
             if status != 'success':
-                shared.printLock.acquire()
-                print 'API Error 0007: Could not decode address:', toAddress, ':', status
-                shared.printLock.release()
+                with shared.printLock:
+                    print 'API Error 0007: Could not decode address:', toAddress, ':', status
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + toAddress
                 if status == 'invalidcharacters':
@@ -476,9 +482,9 @@ def _dispatch(self, method, params):
             status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
                 fromAddress)
             if status != 'success':
-                shared.printLock.acquire()
-                print 'API Error 0007: Could not decode address:', fromAddress, ':', status
-                shared.printLock.release()
+                with shared.printLock:
+                    print 'API Error 0007: Could not decode address:', fromAddress, ':', status
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + fromAddress
                 if status == 'invalidcharacters':
@@ -541,9 +547,9 @@ def _dispatch(self, method, params):
             status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
                 fromAddress)
             if status != 'success':
-                shared.printLock.acquire()
-                print 'API Error 0007: Could not decode address:', fromAddress, ':', status
-                shared.printLock.release()
+                with shared.printLock:
+                    print 'API Error 0007: Could not decode address:', fromAddress, ':', status
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + fromAddress
                 if status == 'invalidcharacters':
@@ -612,9 +618,9 @@ def _dispatch(self, method, params):
             status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
                 address)
             if status != 'success':
-                shared.printLock.acquire()
-                print 'API Error 0007: Could not decode address:', address, ':', status
-                shared.printLock.release()
+                with shared.printLock:
+                    print 'API Error 0007: Could not decode address:', address, ':', status
+
                 if status == 'checksumfailed':
                     return 'API Error 0008: Checksum failed for address: ' + address
                 if status == 'invalidcharacters':
@@ -741,9 +747,9 @@ def run(self):
         except:
             apiNotifyPath = ''
         if apiNotifyPath != '':
-            shared.printLock.acquire()
-            print 'Trying to call', apiNotifyPath
-            shared.printLock.release()
+            with shared.printLock:
+                print 'Trying to call', apiNotifyPath
+
             call([apiNotifyPath, "startingUp"])
         singleAPIThread = singleAPI()
         singleAPIThread.daemon = True  # close the main program even if there are threads left
@@ -774,9 +780,9 @@ def run(self):
         import bitmessageqt
         bitmessageqt.run()
     else:
-        shared.printLock.acquire()
-        print 'Running as a daemon. You can use Ctrl+C to exit.'
-        shared.printLock.release()
+        with shared.printLock:
+            print 'Running as a daemon. You can use Ctrl+C to exit.'
+
         while True:
             time.sleep(20)
 

src/bitmessageqt/__init__.py

@@ -1288,9 +1288,9 @@ def click_pushButtonSend(self):
                     status, addressVersionNumber, streamNumber, ripe = decodeAddress(
                         toAddress)
                     if status != 'success':
-                        shared.printLock.acquire()
-                        print 'Error: Could not decode', toAddress, ':', status
-                        shared.printLock.release()
+                        with shared.printLock:
+                            print 'Error: Could not decode', toAddress, ':', status
+
                         if status == 'missingbm':
                             self.statusBar().showMessage(_translate(
                                 "MainWindow", "Error: Bitmessage addresses start with BM-   Please check %1").arg(toAddress))
@@ -2621,9 +2621,9 @@ def writeNewAddressToTable(self, label, address, streamNumber):
 
     def updateStatusBar(self, data):
         if data != "":
-            shared.printLock.acquire()
-            print 'Status bar:', data
-            shared.printLock.release()
+            with shared.printLock:
+                print 'Status bar:', data
+
         self.statusBar().showMessage(data)
 
 
@@ -2875,59 +2875,80 @@ class myTableWidgetItem(QTableWidgetItem):
     def __lt__(self, other):
         return int(self.data(33).toPyObject()) < int(other.data(33).toPyObject())
 
-
-class UISignaler(QThread):
+from threading import Thread
+class UISignaler(Thread,QThread):
 
     def __init__(self, parent=None):
+        Thread.__init__(self, parent)
         QThread.__init__(self, parent)
 
     def run(self):
         while True:
-            command, data = shared.UISignalQueue.get()
-            if command == 'writeNewAddressToTable':
-                label, address, streamNumber = data
-                self.emit(SIGNAL(
-                    "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), label, address, str(streamNumber))
-            elif command == 'updateStatusBar':
-                self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"), data)
-            elif command == 'updateSentItemStatusByHash':
-                hash, message = data
-                self.emit(SIGNAL(
-                    "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), hash, message)
-            elif command == 'updateSentItemStatusByAckdata':
-                ackData, message = data
-                self.emit(SIGNAL(
-                    "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), ackData, message)
-            elif command == 'displayNewInboxMessage':
-                inventoryHash, toAddress, fromAddress, subject, body = data
-                self.emit(SIGNAL(
-                    "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
-                    inventoryHash, toAddress, fromAddress, subject, body)
-            elif command == 'displayNewSentMessage':
-                toAddress, fromLabel, fromAddress, subject, message, ackdata = data
-                self.emit(SIGNAL(
-                    "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
-                    toAddress, fromLabel, fromAddress, subject, message, ackdata)
-            elif command == 'updateNetworkStatusTab':
-                self.emit(SIGNAL("updateNetworkStatusTab()"))
-            elif command == 'incrementNumberOfMessagesProcessed':
-                self.emit(SIGNAL("incrementNumberOfMessagesProcessed()"))
-            elif command == 'incrementNumberOfPubkeysProcessed':
-                self.emit(SIGNAL("incrementNumberOfPubkeysProcessed()"))
-            elif command == 'incrementNumberOfBroadcastsProcessed':
-                self.emit(SIGNAL("incrementNumberOfBroadcastsProcessed()"))
-            elif command == 'setStatusIcon':
-                self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"), data)
-            elif command == 'rerenderInboxFromLabels':
-                self.emit(SIGNAL("rerenderInboxFromLabels()"))
-            elif command == 'rerenderSubscriptions':
-                self.emit(SIGNAL("rerenderSubscriptions()"))
-            elif command == 'removeInboxRowByMsgid':
-                self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), data)
-            else:
-                sys.stderr.write(
-                    'Command sent to UISignaler not recognized: %s\n' % command)
+            try:
+                command, data = shared.UISignalQueue.get()
+                if command == 'writeNewAddressToTable':
+                    label, address, streamNumber = data
+                    self.emit(SIGNAL(
+                        "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), label, address, str(streamNumber))
+                elif command == 'updateStatusBar':
+                    self.emit(SIGNAL("updateStatusBar(PyQt_PyObject)"), data)
+                elif command == 'updateSentItemStatusByHash':
+                    hash, message = data
+                    self.emit(SIGNAL(
+                        "updateSentItemStatusByHash(PyQt_PyObject,PyQt_PyObject)"), hash, message)
+                elif command == 'updateSentItemStatusByAckdata':
+                    ackData, message = data
+                    self.emit(SIGNAL(
+                        "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), ackData, message)
+                elif command == 'displayNewInboxMessage':
+                    inventoryHash, toAddress, fromAddress, subject, body = data
+                    self.emit(SIGNAL(
+                        "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
+                        inventoryHash, toAddress, fromAddress, subject, body)
+                elif command == 'displayNewSentMessage':
+                    toAddress, fromLabel, fromAddress, subject, message, ackdata = data
+                    self.emit(SIGNAL(
+                        "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"),
+                        toAddress, fromLabel, fromAddress, subject, message, ackdata)
+                elif command == 'updateNetworkStatusTab':
+                    self.emit(SIGNAL("updateNetworkStatusTab()"))
+                elif command == 'incrementNumberOfMessagesProcessed':
+                    self.emit(SIGNAL("incrementNumberOfMessagesProcessed()"))
+                elif command == 'incrementNumberOfPubkeysProcessed':
+                    self.emit(SIGNAL("incrementNumberOfPubkeysProcessed()"))
+                elif command == 'incrementNumberOfBroadcastsProcessed':
+                    self.emit(SIGNAL("incrementNumberOfBroadcastsProcessed()"))
+                elif command == 'setStatusIcon':
+                    self.emit(SIGNAL("setStatusIcon(PyQt_PyObject)"), data)
+                elif command == 'rerenderInboxFromLabels':
+                    self.emit(SIGNAL("rerenderInboxFromLabels()"))
+                elif command == 'rerenderSubscriptions':
+                    self.emit(SIGNAL("rerenderSubscriptions()"))
+                elif command == 'removeInboxRowByMsgid':
+                    self.emit(SIGNAL("removeInboxRowByMsgid(PyQt_PyObject)"), data)
+                else:
+                    sys.stderr.write(
+                        'Command sent to UISignaler not recognized: %s\n' % command)
+            except Exception,ex:
+                # uncaught exception will block gevent
+                import traceback
+                traceback.print_exc()
+                traceback.print_stack()
+                print ex
+                pass
 
+try:
+    import gevent
+except ImportError as ex:
+    gevent = None
+else:
+    def mainloop(app):
+        while True:
+            app.processEvents()
+            gevent.sleep(0.01)
+    def testprint():
+        #print 'this is running'
+        gevent.spawn_later(1, testprint)
 
 def run():
     app = QtGui.QApplication(sys.argv)
@@ -2946,5 +2967,8 @@ def run():
     myapp.appIndicatorInit(app)
     myapp.ubuntuMessagingMenuInit()
     myapp.notifierInit()
-
-    sys.exit(app.exec_())
+    if gevent is None:
+        sys.exit(app.exec_())
+    else:
+        gevent.joinall([gevent.spawn(testprint), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app), gevent.spawn(mainloop, app)])
+        print 'done'

src/class_bgWorker.py

@@ -0,0 +1,38 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+# cody by linker.lin@me.com
+
+__author__ = 'linkerlin'
+
+
+import threading
+import Queue
+import time
+
+class bgWorker(threading.Thread):
+    def __init__(self):
+        threading.Thread.__init__(self)
+        self.q = Queue.Queue()
+        self.setDaemon(True)
+
+    def post(self,job):
+        self.q.put(job)
+
+    def run(self):
+        while 1:
+            job=None
+            try:
+                job = self.q.get(block=True)
+                if job:
+                    job()
+            except Exception as ex:
+                print "Error,job exception:",ex.message,type(ex)
+                time.sleep(0.05)
+            else:
+                #print "job: ", job, " done"
+                pass
+            finally:
+                time.sleep(0.05)
+
+bgworker = bgWorker()
+bgworker.start()

src/class_outgoingSynSender.py

@@ -61,15 +61,15 @@ def run(self):
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             sock.settimeout(20)
             if shared.config.get('bitmessagesettings', 'socksproxytype') == 'none' and shared.verbose >= 2:
-                shared.printLock.acquire()
-                print 'Trying an outgoing connection to', HOST, ':', PORT
-                shared.printLock.release()
+                with shared.printLock:
+                    print 'Trying an outgoing connection to', HOST, ':', PORT
+
                 # sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS4a':
                 if shared.verbose >= 2:
-                    shared.printLock.acquire()
-                    print '(Using SOCKS4a) Trying an outgoing connection to', HOST, ':', PORT
-                    shared.printLock.release()
+                    with shared.printLock:
+                        print '(Using SOCKS4a) Trying an outgoing connection to', HOST, ':', PORT
+
                 proxytype = socks.PROXY_TYPE_SOCKS4
                 sockshostname = shared.config.get(
                     'bitmessagesettings', 'sockshostname')
@@ -88,9 +88,9 @@ def run(self):
                         proxytype, sockshostname, socksport, rdns)
             elif shared.config.get('bitmessagesettings', 'socksproxytype') == 'SOCKS5':
                 if shared.verbose >= 2:
-                    shared.printLock.acquire()
-                    print '(Using SOCKS5) Trying an outgoing connection to', HOST, ':', PORT
-                    shared.printLock.release()
+                    with shared.printLock:
+                        print '(Using SOCKS5) Trying an outgoing connection to', HOST, ':', PORT
+
                 proxytype = socks.PROXY_TYPE_SOCKS5
                 sockshostname = shared.config.get(
                     'bitmessagesettings', 'sockshostname')
@@ -116,9 +116,9 @@ def run(self):
                 rd.setup(sock, HOST, PORT, self.streamNumber,
                          someObjectsOfWhichThisRemoteNodeIsAlreadyAware, self.selfInitiatedConnections)
                 rd.start()
-                shared.printLock.acquire()
-                print self, 'connected to', HOST, 'during an outgoing attempt.'
-                shared.printLock.release()
+                with shared.printLock:
+                    print self, 'connected to', HOST, 'during an outgoing attempt.'
+
 
                 sd = sendDataThread()
                 sd.setup(sock, HOST, PORT, self.streamNumber,
@@ -128,18 +128,18 @@ def run(self):
 
             except socks.GeneralProxyError as err:
                 if shared.verbose >= 2:
-                    shared.printLock.acquire()
-                    print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
-                    shared.printLock.release()
+                    with shared.printLock:
+                        print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
+
                 PORT, timeLastSeen = shared.knownNodes[
                     self.streamNumber][HOST]
                 if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000:  # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the shared.knownNodes data-structure.
                     shared.knownNodesLock.acquire()
                     del shared.knownNodes[self.streamNumber][HOST]
                     shared.knownNodesLock.release()
-                    shared.printLock.acquire()
-                    print 'deleting ', HOST, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.'
-                    shared.printLock.release()
+                    with shared.printLock:
+                        print 'deleting ', HOST, 'from shared.knownNodes because it is more than 48 hours old and we could not connect to it.'
+
             except socks.Socks5AuthError as err:
                 shared.UISignalQueue.put((
                     'updateStatusBar', tr.translateText(
@@ -154,18 +154,18 @@ def run(self):
                     print 'Bitmessage MIGHT be having trouble connecting to the SOCKS server. ' + str(err)
                 else:
                     if shared.verbose >= 1:
-                        shared.printLock.acquire()
-                        print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
-                        shared.printLock.release()
+                        with shared.printLock:
+                            print 'Could NOT connect to', HOST, 'during outgoing attempt.', err
+
                     PORT, timeLastSeen = shared.knownNodes[
                         self.streamNumber][HOST]
                     if (int(time.time()) - timeLastSeen) > 172800 and len(shared.knownNodes[self.streamNumber]) > 1000:  # for nodes older than 48 hours old if we have more than 1000 hosts in our list, delete from the knownNodes data-structure.
                         shared.knownNodesLock.acquire()
                         del shared.knownNodes[self.streamNumber][HOST]
                         shared.knownNodesLock.release()
-                        shared.printLock.acquire()
-                        print 'deleting ', HOST, 'from knownNodes because it is more than 48 hours old and we could not connect to it.'
-                        shared.printLock.release()
+                        with shared.printLock:
+                            print 'deleting ', HOST, 'from knownNodes because it is more than 48 hours old and we could not connect to it.'
+
             except Exception as err:
                 sys.stderr.write(
                     'An exception has occurred in the outgoingSynSender thread that was not caught by other exception types: ')